From patchwork Fri Mar 8 16:17:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10845103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB1E21669 for ; Fri, 8 Mar 2019 16:17:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D76912FC01 for ; Fri, 8 Mar 2019 16:17:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBA7F2FC0A; Fri, 8 Mar 2019 16:17:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C7FB2FC01 for ; Fri, 8 Mar 2019 16:17:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6020A6E3E1; Fri, 8 Mar 2019 16:17:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F8856E3E1 for ; Fri, 8 Mar 2019 16:17:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 278B510A2E2B; Fri, 8 Mar 2019 08:17:23 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 3MJO0dbiJEtt; Fri, 8 Mar 2019 08:17:21 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 691BF10A2E2C; Fri, 8 Mar 2019 08:17:17 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 2B3F82FE4656; Fri, 8 Mar 2019 08:17:16 -0800 (PST) From: Eric Anholt To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/4] drm/v3d: Remove some dead members of struct v3d_bo. Date: Fri, 8 Mar 2019 08:17:15 -0800 Message-Id: <20190308161716.2466-4-eric@anholt.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190308161716.2466-1-eric@anholt.net> References: <20190308161716.2466-1-eric@anholt.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: david.emett@broadcom.com, thomas.spurden@broadcom.com, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP vmas was from the previous model of page table management (one per fd), and vaddr was left over from vc4. Signed-off-by: Eric Anholt --- drivers/gpu/drm/v3d/v3d_bo.c | 1 - drivers/gpu/drm/v3d/v3d_drv.h | 9 --------- 2 files changed, 10 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c index 5c83b392b20a..dff38bf36c50 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -117,7 +117,6 @@ static struct v3d_bo *v3d_bo_create_struct(struct drm_device *dev, return ERR_PTR(-ENOMEM); obj = &bo->base; - INIT_LIST_HEAD(&bo->vmas); INIT_LIST_HEAD(&bo->unref_head); mutex_init(&bo->lock); diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index d856159bd007..f5ed915a0f15 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -108,12 +108,6 @@ struct v3d_file_priv { struct drm_sched_entity sched_entity[V3D_MAX_QUEUES]; }; -/* Tracks a mapping of a BO into a per-fd address space */ -struct v3d_vma { - struct v3d_page_table *pt; - struct list_head list; /* entry in v3d_bo.vmas */ -}; - struct v3d_bo { struct drm_gem_object base; @@ -124,9 +118,6 @@ struct v3d_bo { u32 pages_refcount; struct page **pages; struct sg_table *sgt; - void *vaddr; - - struct list_head vmas; /* list of v3d_vma */ /* List entry for the BO's position in * v3d_exec_info->unref_list