From patchwork Thu Apr 20 21:33:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9691359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75B7C60383 for ; Thu, 20 Apr 2017 21:33:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67A8E28491 for ; Thu, 20 Apr 2017 21:33:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C85028497; Thu, 20 Apr 2017 21:33:07 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 1AF5128491 for ; Thu, 20 Apr 2017 21:33:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F1DE6E0F4; Thu, 20 Apr 2017 21:33:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DC826E1B0 for ; Thu, 20 Apr 2017 21:33:05 +0000 (UTC) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 08147204C1; Thu, 20 Apr 2017 23:32:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1492723941; bh=BlFsuqUrmxn+2YeS9jblE/frN4kOrj5hHPXBFiXH1u4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2kp9D62OcbipecpnudpKauJJiDRsPaGpIC+7QNwTKnaosw8fCt4CCX+XIAV+sFa2 nz/BdjIrtrq9NKzSy8U00SHnrkEiU1/0bedG6A3BKMs6tmkN+ihTffIEaFz1eaUH02 hnF/mB/WchoHF0AQE3X/KsTLe9UX0DJqMkhJ3DMI= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 05/10] drm: omapdrm: Rename the omap_gem_object addrs field to dma_addrs Date: Fri, 21 Apr 2017 00:33:54 +0300 Message-Id: <20170420213359.31300-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170420213359.31300-1-laurent.pinchart@ideasonboard.com> References: <20170420213359.31300-1-laurent.pinchart@ideasonboard.com> Cc: Tomi Valkeinen X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The field contains DMA addresses, clarify that by renaming it. Signed-off-by: Laurent Pinchart Reviewed-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/omap_gem.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 37ac3832c208..055a0c886ab1 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -95,7 +95,7 @@ struct omap_gem_object { struct page **pages; /** addresses corresponding to pages in above array */ - dma_addr_t *addrs; + dma_addr_t *dma_addrs; /** * Virtual address, if mapped. @@ -277,7 +277,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj) } } - omap_obj->addrs = addrs; + omap_obj->dma_addrs = addrs; omap_obj->pages = pages; return 0; @@ -323,15 +323,15 @@ static void omap_gem_detach_pages(struct drm_gem_object *obj) if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) { int i, npages = obj->size >> PAGE_SHIFT; for (i = 0; i < npages; i++) { - if (omap_obj->addrs[i]) + if (omap_obj->dma_addrs[i]) dma_unmap_page(obj->dev->dev, - omap_obj->addrs[i], + omap_obj->dma_addrs[i], PAGE_SIZE, DMA_BIDIRECTIONAL); } } - kfree(omap_obj->addrs); - omap_obj->addrs = NULL; + kfree(omap_obj->dma_addrs); + omap_obj->dma_addrs = NULL; drm_gem_put_pages(obj, omap_obj->pages, true, false); omap_obj->pages = NULL; @@ -739,10 +739,10 @@ void omap_gem_cpu_sync(struct drm_gem_object *obj, int pgoff) struct drm_device *dev = obj->dev; struct omap_gem_object *omap_obj = to_omap_bo(obj); - if (is_cached_coherent(obj) && omap_obj->addrs[pgoff]) { - dma_unmap_page(dev->dev, omap_obj->addrs[pgoff], + if (is_cached_coherent(obj) && omap_obj->dma_addrs[pgoff]) { + dma_unmap_page(dev->dev, omap_obj->dma_addrs[pgoff], PAGE_SIZE, DMA_BIDIRECTIONAL); - omap_obj->addrs[pgoff] = 0; + omap_obj->dma_addrs[pgoff] = 0; } } @@ -760,7 +760,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, return; for (i = 0; i < npages; i++) { - if (!omap_obj->addrs[i]) { + if (!omap_obj->dma_addrs[i]) { dma_addr_t addr; addr = dma_map_page(dev->dev, pages[i], 0, @@ -773,7 +773,7 @@ void omap_gem_dma_sync(struct drm_gem_object *obj, } dirty = true; - omap_obj->addrs[i] = addr; + omap_obj->dma_addrs[i] = addr; } }