From patchwork Thu Apr 2 15:30:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 6149961 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5BAFEBF4A6 for ; Thu, 2 Apr 2015 15:32:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F0A9203AF for ; Thu, 2 Apr 2015 15:32:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 61D12203AB for ; Thu, 2 Apr 2015 15:32:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1807D6EA66; Thu, 2 Apr 2015 08:31:12 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 177136EA60 for ; Thu, 2 Apr 2015 08:31:00 -0700 (PDT) Received: from dude.hi.4.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Ydh59-0005OD-CX; Thu, 02 Apr 2015 17:30:59 +0200 From: Lucas Stach To: dri-devel@lists.freedesktop.org Subject: [PATCH RFC 069/111] staging: etnaviv: move scatterlist map/unmap Date: Thu, 2 Apr 2015 17:30:11 +0200 Message-Id: <1427988653-754-70-git-send-email-l.stach@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.7 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell King Signed-off-by: Russell King --- drivers/staging/etnaviv/etnaviv_gem.c | 89 ++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/drivers/staging/etnaviv/etnaviv_gem.c b/drivers/staging/etnaviv/etnaviv_gem.c index 2f2bf5619ffd..8eeafcafb4e9 100644 --- a/drivers/staging/etnaviv/etnaviv_gem.c +++ b/drivers/staging/etnaviv/etnaviv_gem.c @@ -23,6 +23,55 @@ #include "etnaviv_gpu.h" #include "etnaviv_mmu.h" +static void etnaviv_gem_scatter_map(struct etnaviv_gem_object *etnaviv_obj) +{ + struct drm_device *dev = etnaviv_obj->base.dev; + + /* + * For non-cached buffers, ensure the new pages are clean + * because display controller, GPU, etc. are not coherent. + */ + if (etnaviv_obj->flags & (ETNA_BO_WC|ETNA_BO_CACHED)) { + dma_map_sg(dev->dev, etnaviv_obj->sgt->sgl, + etnaviv_obj->sgt->nents, DMA_BIDIRECTIONAL); + } else { + struct scatterlist *sg; + unsigned int i; + + for_each_sg(sgt->sgl, sg, sgt->nents, i) { + sg_dma_address(sg) = sg_phys(sg); +#ifdef CONFIG_NEED_SG_DMA_LENGTH + sg_dma_len(sg) = sg->length; +#endif + } + } +} + +static void etnaviv_gem_scatterlist_unmap(struct etnaviv_gem_object *etnaviv_obj) +{ + struct drm_device *dev = etnaviv_obj->base.dev; + + /* + * For non-cached buffers, ensure the new pages are clean + * because display controller, GPU, etc. are not coherent: + * + * WARNING: The DMA API does not support concurrent CPU + * and device access to the memory area. With BIDIRECTIONAL, + * we will clean the cache lines which overlap the region, + * and invalidate all cache lines (partially) contained in + * the region. + * + * If you have dirty data in the overlapping cache lines, + * that will corrupt the GPU-written data. If you have + * written into the remainder of the region, this can + * discard those writes. + */ + if (etnaviv_obj->flags & (ETNA_BO_WC|ETNA_BO_CACHED)) + dma_unmap_sg(dev->dev, etnaviv_obj->sgt->sgl, + etnaviv_obj->sgt->nents, + DMA_BIDIRECTIONAL); +} + /* called with dev->struct_mutex held */ static int etnaviv_gem_shmem_get_pages(struct etnaviv_gem_object *etnaviv_obj) { @@ -42,27 +91,7 @@ static int etnaviv_gem_shmem_get_pages(struct etnaviv_gem_object *etnaviv_obj) static void put_pages(struct etnaviv_gem_object *etnaviv_obj) { if (etnaviv_obj->sgt) { - struct drm_device *dev = etnaviv_obj->base.dev; - - /* - * For non-cached buffers, ensure the new pages are clean - * because display controller, GPU, etc. are not coherent: - * - * WARNING: The DMA API does not support concurrent CPU - * and device access to the memory area. With BIDIRECTIONAL, - * we will clean the cache lines which overlap the region, - * and invalidate all cache lines (partially) contained in - * the region. - * - * If you have dirty data in the overlapping cache lines, - * that will corrupt the GPU-written data. If you have - * written into the remainder of the region, this can - * discard those writes. - */ - if (etnaviv_obj->flags & (ETNA_BO_WC|ETNA_BO_CACHED)) - dma_unmap_sg(dev->dev, etnaviv_obj->sgt->sgl, - etnaviv_obj->sgt->nents, - DMA_BIDIRECTIONAL); + etnaviv_gem_scatterlist_unmap(etnaviv_obj); sg_free_table(etnaviv_obj->sgt); kfree(etnaviv_obj->sgt); etnaviv_obj->sgt = NULL; @@ -99,13 +128,7 @@ struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *etnaviv_obj) etnaviv_obj->sgt = sgt; - /* - * For non-cached buffers, ensure the new pages are clean - * because display controller, GPU, etc. are not coherent. - */ - if (etnaviv_obj->flags & (ETNA_BO_WC|ETNA_BO_CACHED)) - dma_map_sg(dev->dev, etnaviv_obj->sgt->sgl, - etnaviv_obj->sgt->nents, DMA_BIDIRECTIONAL); + etnaviv_gem_scatter_map(etnaviv_obj); } return etnaviv_obj->pages; @@ -836,15 +859,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj) { if (etnaviv_obj->sgt) { - /* - * For non-cached buffers, ensure the new pages are clean - * because display controller, GPU, etc. are not coherent: - */ - if (etnaviv_obj->flags & (ETNA_BO_WC|ETNA_BO_CACHED)) - dma_unmap_sg(etnaviv_obj->base.dev->dev, - etnaviv_obj->sgt->sgl, - etnaviv_obj->sgt->nents, - DMA_BIDIRECTIONAL); + etnaviv_gem_scatterlist_unmap(etnaviv_obj); sg_free_table(etnaviv_obj->sgt); kfree(etnaviv_obj->sgt); }