From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 921C4CA9EA0 for ; Tue, 22 Oct 2019 11:19:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F13220B7C for ; Tue, 22 Oct 2019 11:19:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B31N+8ps"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rzTrzyqE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F13220B7C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mKfIz+xqpRYajhND1ZV8e6p0sa21RqOMOBcEYJl343A=; b=B31N+8psWKp8xP 4Ji1NFgKHwloPESDpeJkzLd4upgCefgX5oD/J9J465R2HHtYjKzZ1pX1xgZCZYqh+q51JgTQ6Wp25 T1wbbptChcfz8UzkoL5kLzgptXpHZA7kJZXyvaLBuj5B6ZoWcC9R3xJ4cswcsgoTVlQCYpqhzImTh 3sEKNBIWJ8r0yIhUb2eknWUA6x/sP5SbYli6FlsigGsO02E4vt8v+YwS6LdhCIHlmEsNMvqn+1EFw mg1CUI+BVS0F4TPx62cjmz2TGYhiA7QQzduzkNrGfQ8+yrtVn4uYN6SZZBBxIlLMkU+fv6oAsvpG4 04EEM+S5fdRkz1YiPhuQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMsC5-0000rA-DT; Tue, 22 Oct 2019 11:19:17 +0000 Received: from perceval.ideasonboard.com ([2001:4b98:dc2:55:216:3eff:fef7:d647]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMsBm-0000cj-PR; Tue, 22 Oct 2019 11:19:02 +0000 Received: from pendragon.ideasonboard.com (143.121.2.93.rev.sfr.net [93.2.121.143]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3AB65A2C; Tue, 22 Oct 2019 13:18:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1571743134; bh=oS7CmPV8UD0nLLejLW9+oTb/3yWIxQqsikap2UyJtwY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=rzTrzyqEEhFKAKpH0TMnAV+xM4eltHUNpUsSsNkPiezxqQMASXUga56G7X0sGmOsF TCF6T+e/AcItSRr45a3fWVkAyT8EcBY+5GpFmCsNH+laQ+6kFuaeXuugYO3iggbHw7 gbL3fP6hSNj5PGzTr3t01Z8CCR/AcObIKfblXsG0= Date: Tue, 22 Oct 2019 14:18:49 +0300 From: Laurent Pinchart To: Rob Herring Subject: Re: [PATCH 3/6] drm/cma-helper: Use the dma_*_attr API variant Message-ID: <20191022111849.GF4756@pendragon.ideasonboard.com> References: <20191021214550.1461-1-robh@kernel.org> <20191021214550.1461-4-robh@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191021214550.1461-4-robh@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191022_041859_117468_E32CC446 X-CRM114-Status: GOOD ( 16.84 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko =?utf-8?Q?St=C3=BCbner?= , Neil Armstrong , David Airlie , Liviu Dudau , dri-devel@lists.freedesktop.org, Sandy Huang , Benjamin Gaignard , Yannick Fertre , Kevin Hilman , Xinwei Kong , Xinliang Liu , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Noralf =?utf-8?Q?Tr=C3=B8nnes?= , "James \(Qian\) Wang" , CK Hu , Philipp Zabel , Alexandre Torgue , Chen Feng , Maarten Lankhorst , Maxime Ripard , linux-mediatek@lists.infradead.org, Matthias Brugger , Daniel Vetter , Sean Paul , linux-arm-kernel@lists.infradead.org, Philippe Cornu , Vincent Abriou , Kieran Bingham , Maxime Coquelin , Rongrong Zou Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Rob, Thank you for the patch. On Mon, Oct 21, 2019 at 04:45:47PM -0500, Rob Herring wrote: > In preparation to allow DRM CMA users to adjust the DMA_ATTR_* flags, > convert the CMA helper code to use the dma_*_attr APIs instead of the > dma_*_wc variants. > > Only the DMA_ATTR_WRITE_COMBINE and DMA_ATTR_NO_WARN attributes are set > in this commit, so there's no functional change. Apart from the documentation issue reported by kbuild, Reviewed-by: Laurent Pinchart > Cc: Maarten Lankhorst > Cc: Maxime Ripard > Cc: Sean Paul > Cc: David Airlie > Cc: Daniel Vetter > Signed-off-by: Rob Herring > --- > drivers/gpu/drm/drm_gem_cma_helper.c | 20 ++++++++++++-------- > include/drm/drm_gem_cma_helper.h | 1 + > 2 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c > index 12e98fb28229..4cebfe01e6ea 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c > @@ -70,6 +70,7 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size) > goto error; > } > > + cma_obj->dma_attrs |= DMA_ATTR_NO_WARN | DMA_ATTR_WRITE_COMBINE; > return cma_obj; > > error: > @@ -102,8 +103,9 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, > if (IS_ERR(cma_obj)) > return cma_obj; > > - cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr, > - GFP_KERNEL | __GFP_NOWARN); > + cma_obj->vaddr = dma_alloc_attrs(drm->dev, size, &cma_obj->paddr, > + GFP_KERNEL | __GFP_NOWARN, > + cma_obj->dma_attrs); > if (!cma_obj->vaddr) { > dev_dbg(drm->dev, "failed to allocate buffer with size %zu\n", > size); > @@ -184,8 +186,9 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj) > dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr); > drm_prime_gem_destroy(gem_obj, cma_obj->sgt); > } else if (cma_obj->vaddr) { > - dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, > - cma_obj->vaddr, cma_obj->paddr); > + dma_free_attrs(gem_obj->dev->dev, cma_obj->base.size, > + cma_obj->vaddr, cma_obj->paddr, > + cma_obj->dma_attrs); > } > > drm_gem_object_release(gem_obj); > @@ -279,8 +282,9 @@ static int drm_gem_cma_mmap_obj(struct drm_gem_cma_object *cma_obj, > vma->vm_flags &= ~VM_PFNMAP; > vma->vm_pgoff = 0; > > - ret = dma_mmap_wc(cma_obj->base.dev->dev, vma, cma_obj->vaddr, > - cma_obj->paddr, vma->vm_end - vma->vm_start); > + ret = dma_mmap_attrs(cma_obj->base.dev->dev, vma, cma_obj->vaddr, > + cma_obj->paddr, vma->vm_end - vma->vm_start, > + cma_obj->dma_attrs); > if (ret) > drm_gem_vm_close(vma); > > @@ -434,8 +438,8 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj) > if (!sgt) > return ERR_PTR(-ENOMEM); > > - ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, > - cma_obj->paddr, obj->size); > + ret = dma_get_sgtable_attrs(obj->dev->dev, sgt, cma_obj->vaddr, > + cma_obj->paddr, obj->size, cma_obj->dma_attrs); > if (ret < 0) > goto out; > > diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h > index 947ac95eb24a..d042213c3595 100644 > --- a/include/drm/drm_gem_cma_helper.h > +++ b/include/drm/drm_gem_cma_helper.h > @@ -24,6 +24,7 @@ struct drm_gem_cma_object { > > /* For objects with DMA memory allocated by GEM CMA */ > void *vaddr; > + unsigned long dma_attrs; > }; > > #define to_drm_gem_cma_obj(gem_obj) \ -- Regards, Laurent Pinchart _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek