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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 B46F4C4338F for ; Sun, 25 Jul 2021 20:03:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 7604360E78 for ; Sun, 25 Jul 2021 20:03:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7604360E78 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 009D06E4AD; Sun, 25 Jul 2021 20:03:53 +0000 (UTC) Received: from mx2.smtp.larsendata.com (mx2.smtp.larsendata.com [91.221.196.228]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A26E6E4AD for ; Sun, 25 Jul 2021 20:03:51 +0000 (UTC) Received: from mail01.mxhotel.dk (mail01.mxhotel.dk [91.221.196.236]) by mx2.smtp.larsendata.com (Halon) with ESMTPS id 772e8183-ed83-11eb-8d1a-0050568cd888; Sun, 25 Jul 2021 20:04:06 +0000 (UTC) Received: from ravnborg.org (80-162-45-141-cable.dk.customer.tdc.net [80.162.45.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sam@ravnborg.org) by mail01.mxhotel.dk (Postfix) with ESMTPSA id 14F79194B77; Sun, 25 Jul 2021 22:04:09 +0200 (CEST) Date: Sun, 25 Jul 2021 22:03:48 +0200 X-Report-Abuse-To: abuse@mxhotel.dk From: Sam Ravnborg To: Thomas Zimmermann Subject: Re: [PATCH v2 4/5] drm/gud: Map framebuffer BOs with drm_gem_fb_vmap() Message-ID: References: <20210725174438.24493-1-tzimmermann@suse.de> <20210725174438.24493-5-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210725174438.24493-5-tzimmermann@suse.de> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, rodrigosiqueiramelo@gmail.com, airlied@linux.ie, melissa.srw@gmail.com, noralf@tronnes.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Sun, Jul 25, 2021 at 07:44:37PM +0200, Thomas Zimmermann wrote: > Abstract the framebuffer details by mapping its BOs with a call > to drm_gem_fb_vmap(). Unmap with drm_gem_fb_vunmap(). > > The call to drm_gem_fb_vmap() ensures that all BOs are mapped > correctly. Gud still only supports single-plane formats. > > No functional changes. > > Signed-off-by: Thomas Zimmermann > Acked-by: Noralf Trønnes Acked-by: Sam Ravnborg > --- > drivers/gpu/drm/gud/gud_pipe.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c > index 4d7a26b68a2e..7e009f562b30 100644 > --- a/drivers/gpu/drm/gud/gud_pipe.c > +++ b/drivers/gpu/drm/gud/gud_pipe.c > @@ -14,8 +14,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -152,7 +152,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, > { > struct dma_buf_attachment *import_attach = fb->obj[0]->import_attach; > u8 compression = gdrm->compression; > - struct dma_buf_map map; > + struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; > void *vaddr, *buf; > size_t pitch, len; > int ret = 0; > @@ -162,11 +162,11 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, > if (len > gdrm->bulk_len) > return -E2BIG; > > - ret = drm_gem_shmem_vmap(fb->obj[0], &map); > + ret = drm_gem_fb_vmap(fb, map); > if (ret) > return ret; > > - vaddr = map.vaddr + fb->offsets[0]; > + vaddr = map[0].vaddr + fb->offsets[0]; > > ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); > if (ret) > @@ -225,7 +225,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, > end_cpu_access: > drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE); > vunmap: > - drm_gem_shmem_vunmap(fb->obj[0], &map); > + drm_gem_fb_vunmap(fb, map); > > return ret; > } > -- > 2.32.0