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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AA168C19F21 for ; Thu, 4 Aug 2022 20:14:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE92FA2F03; Thu, 4 Aug 2022 20:14:39 +0000 (UTC) Received: from mailrelay2-1.pub.mailoutpod1-cph3.one.com (mailrelay2-1.pub.mailoutpod1-cph3.one.com [46.30.210.183]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16E2DA689D for ; Thu, 4 Aug 2022 20:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravnborg.org; s=rsa1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=PDdWY3J5F42/kV0fK/NLRkNTcM9K+0KHV8LYVQICa9A=; b=JWQk/46duxHewpu+kZDQMrKArmxrpBJOnDjRi4I8qfHqfK8aUCMnAlGCD/FXCeUJSo9A4B5VBXIZ5 +FtUSJSNy3SKvSQGpx1e5/xvRY8ag8b1Q7ocDgM/42SpDRc9Y1vQDWfLlR6BvXjIwcR0sLE5rXPeA1 Sn7mWpSJFIY3boLVrclgOXYDHGmlx8I1AO91ku9iPahxWfjAy0kPthe53IfhIMFk4JP9gjNGJT3Uyk hizm1BybjACqoFe/3LtycBYuamDml9t2nK7AGKJWvB1NZFLYRGPdg0lgrRiHANECkBZguje6s3pG0d nFogdCHuw982K39EaA/Ckf1MVye7pnw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ravnborg.org; s=ed1; h=in-reply-to:content-type:mime-version:references:message-id:subject:cc:to: from:date:from; bh=PDdWY3J5F42/kV0fK/NLRkNTcM9K+0KHV8LYVQICa9A=; b=Id9YvqjOh+MAXH/FM0t5VlcqM2MGogYC83U6UhTduPkNaJDt567660EDzCd3flNG9Ucg4zS+Yxu/p dldoiHjAw== X-HalOne-Cookie: 017ecdfbed2963a435295bc240f45fbf1081fb66 X-HalOne-ID: 06a95464-1432-11ed-a91b-d0431ea8a290 Received: from mailproxy3.cst.dirpod3-cph3.one.com (2-105-2-98-cable.dk.customer.tdc.net [2.105.2.98]) by mailrelay2.pub.mailoutpod1-cph3.one.com (Halon) with ESMTPSA id 06a95464-1432-11ed-a91b-d0431ea8a290; Thu, 04 Aug 2022 20:14:21 +0000 (UTC) Date: Thu, 4 Aug 2022 22:14:19 +0200 From: Sam Ravnborg To: Thomas Zimmermann Subject: Re: [PATCH 06/12] drm/format-helper: Rework XRGB8888-to-RGB888 conversion Message-ID: References: <20220727113312.22407-1-tzimmermann@suse.de> <20220727113312.22407-7-tzimmermann@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220727113312.22407-7-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: linux-hyperv@vger.kernel.org, david@lechnology.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, javierm@redhat.com, virtualization@lists.linux-foundation.org, drawat.floss@gmail.com, noralf@tronnes.org, kraxel@redhat.com, jose.exposito89@gmail.com, airlied@redhat.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jul 27, 2022 at 01:33:06PM +0200, Thomas Zimmermann wrote: > Update XRGB8888-to-RGB888 conversion to support struct iosys_map > and convert all users. Although these are single-plane color formats, > the new interface supports multi-plane formats for consistency with > drm_fb_blit(). > > Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg > --- > drivers/gpu/drm/drm_format_helper.c | 48 ++++++++++++----------------- > drivers/gpu/drm/gud/gud_pipe.c | 2 +- > drivers/gpu/drm/tiny/cirrus.c | 3 +- > include/drm/drm_format_helper.h | 8 ++--- > 4 files changed, 25 insertions(+), 36 deletions(-) > > diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c > index 8bf5655f5ce0..4edab44336d8 100644 > --- a/drivers/gpu/drm/drm_format_helper.c > +++ b/drivers/gpu/drm/drm_format_helper.c > @@ -383,41 +383,34 @@ static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigne > > /** > * drm_fb_xrgb8888_to_rgb888 - Convert XRGB8888 to RGB888 clip buffer > - * @dst: RGB888 destination buffer > - * @dst_pitch: Number of bytes between two consecutive scanlines within dst > - * @src: XRGB8888 source buffer > + * @dst: Array of RGB888 destination buffers > + * @dst_pitch: Array of numbers of bytes between two consecutive scanlines within dst > + * @vmap: Array of XRGB8888 source buffers > * @fb: DRM framebuffer > * @clip: Clip rectangle area to copy > * > * Drivers can use this function for RGB888 devices that don't natively > * support XRGB8888. > */ > -void drm_fb_xrgb8888_to_rgb888(void *dst, unsigned int dst_pitch, const void *src, > - const struct drm_framebuffer *fb, const struct drm_rect *clip) > +void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch, > + const struct iosys_map *vmap, const struct drm_framebuffer *fb, > + const struct drm_rect *clip) > { > - drm_fb_xfrm(dst, dst_pitch, 3, src, fb, clip, false, drm_fb_xrgb8888_to_rgb888_line); > -} > -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888); > + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { > + 0, 0, 0, 0 > + }; > > -/** > - * drm_fb_xrgb8888_to_rgb888_toio - Convert XRGB8888 to RGB888 clip buffer > - * @dst: RGB565 destination buffer (iomem) > - * @dst_pitch: Number of bytes between two consecutive scanlines within dst > - * @vaddr: XRGB8888 source buffer > - * @fb: DRM framebuffer > - * @clip: Clip rectangle area to copy > - * > - * Drivers can use this function for RGB888 devices that don't natively > - * support XRGB8888. > - */ > -void drm_fb_xrgb8888_to_rgb888_toio(void __iomem *dst, unsigned int dst_pitch, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip) > -{ > - drm_fb_xfrm_toio(dst, dst_pitch, 3, vaddr, fb, clip, false, > - drm_fb_xrgb8888_to_rgb888_line); > + if (!dst_pitch) > + dst_pitch = default_dst_pitch; > + > + if (dst[0].is_iomem) > + drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], 3, vmap[0].vaddr, fb, > + clip, false, drm_fb_xrgb8888_to_rgb888_line); > + else > + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 3, vmap[0].vaddr, fb, > + clip, false, drm_fb_xrgb8888_to_rgb888_line); > } > -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888_toio); > +EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888); > > static void drm_fb_rgb565_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigned int pixels) > { > @@ -598,8 +591,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d > } > } else if (dst_format == DRM_FORMAT_RGB888) { > if (fb_format == DRM_FORMAT_XRGB8888) { > - drm_fb_xrgb8888_to_rgb888_toio(dst[0].vaddr_iomem, dst_pitch[0], > - vmap[0].vaddr, fb, clip); > + drm_fb_xrgb8888_to_rgb888(dst, dst_pitch, vmap, fb, clip); > return 0; > } > } else if (dst_format == DRM_FORMAT_XRGB8888) { > diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c > index a43eb6645352..0caa228f736d 100644 > --- a/drivers/gpu/drm/gud/gud_pipe.c > +++ b/drivers/gpu/drm/gud/gud_pipe.c > @@ -201,7 +201,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, > drm_fb_xrgb8888_to_rgb565(&dst, NULL, map_data, fb, rect, > gud_is_big_endian()); > } else if (format->format == DRM_FORMAT_RGB888) { > - drm_fb_xrgb8888_to_rgb888(buf, 0, vaddr, fb, rect); > + drm_fb_xrgb8888_to_rgb888(&dst, NULL, map_data, fb, rect); > } else { > len = gud_xrgb8888_to_color(buf, format, vaddr, fb, rect); > } > diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c > index 9cd398e4700b..354d5e854a6f 100644 > --- a/drivers/gpu/drm/tiny/cirrus.c > +++ b/drivers/gpu/drm/tiny/cirrus.c > @@ -321,7 +321,6 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, > { > struct cirrus_device *cirrus = to_cirrus(fb->dev); > struct iosys_map dst; > - void *vaddr = vmap->vaddr; /* TODO: Use mapping abstraction properly */ > int idx; > > if (!drm_dev_enter(&cirrus->dev, &idx)) > @@ -339,7 +338,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, > > } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) { > iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect)); > - drm_fb_xrgb8888_to_rgb888_toio(dst.vaddr_iomem, cirrus->pitch, vaddr, fb, rect); > + drm_fb_xrgb8888_to_rgb888(&dst, &cirrus->pitch, vmap, fb, rect); > > } else { > WARN_ON_ONCE("cpp mismatch"); > diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h > index 9f1d45d7ce84..8c633dbab5d6 100644 > --- a/include/drm/drm_format_helper.h > +++ b/include/drm/drm_format_helper.h > @@ -26,11 +26,9 @@ void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pi > void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch, > const struct iosys_map *vmap, const struct drm_framebuffer *fb, > const struct drm_rect *clip, bool swab); > -void drm_fb_xrgb8888_to_rgb888(void *dst, unsigned int dst_pitch, const void *src, > - const struct drm_framebuffer *fb, const struct drm_rect *clip); > -void drm_fb_xrgb8888_to_rgb888_toio(void __iomem *dst, unsigned int dst_pitch, > - const void *vaddr, const struct drm_framebuffer *fb, > - const struct drm_rect *clip); > +void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch, > + const struct iosys_map *vmap, const struct drm_framebuffer *fb, > + const struct drm_rect *clip); > void drm_fb_xrgb8888_to_xrgb2101010_toio(void __iomem *dst, unsigned int dst_pitch, > const void *vaddr, const struct drm_framebuffer *fb, > const struct drm_rect *clip); > -- > 2.37.1