From: Sam Ravnborg <sam@ravnborg.org>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: noralf@tronnes.org, daniel@ffwll.ch, airlied@linux.ie,
mripard@kernel.org, maarten.lankhorst@linux.intel.com,
airlied@redhat.com, javierm@redhat.com, drawat.floss@gmail.com,
kraxel@redhat.com, david@lechnology.com,
jose.exposito89@gmail.com, dri-devel@lists.freedesktop.org,
linux-hyperv@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 05/12] drm/format-helper: Rework XRGB8888-to-RGBG565 conversion
Date: Thu, 4 Aug 2022 22:12:15 +0200 [thread overview]
Message-ID: <YuwoH1GIRl8wthIY@ravnborg.org> (raw)
In-Reply-To: <20220727113312.22407-6-tzimmermann@suse.de>
On Wed, Jul 27, 2022 at 01:33:05PM +0200, Thomas Zimmermann wrote:
> Update XRGB8888-to-RGB565 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 <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/drm_format_helper.c | 59 +++++++++++------------------
> drivers/gpu/drm/drm_mipi_dbi.c | 4 +-
> drivers/gpu/drm/gud/gud_pipe.c | 3 +-
> drivers/gpu/drm/tiny/cirrus.c | 3 +-
> include/drm/drm_format_helper.h | 9 ++---
> 5 files changed, 30 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index 2b5c3746ff4a..8bf5655f5ce0 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -330,9 +330,9 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
>
> /**
> * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
> - * @dst: RGB565 destination buffer
> - * @dst_pitch: Number of bytes between two consecutive scanlines within dst
> - * @vaddr: XRGB8888 source buffer
> + * @dst: Array of RGB565 destination buffers
> + * @dst_pitch: Array of numbers of bytes between two consecutive scanlines within dst
> + * @vmap: Array of XRGB8888 source buffer
> * @fb: DRM framebuffer
> * @clip: Clip rectangle area to copy
> * @swab: Swap bytes
> @@ -340,43 +340,31 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
> * Drivers can use this function for RGB565 devices that don't natively
> * support XRGB8888.
> */
> -void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab)
> +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)
> {
> + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
> + 0, 0, 0, 0
> + };
> + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels);
> +
> if (swab)
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_line);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_swab_line;
> else
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> -}
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_line;
>
> -/**
> - * drm_fb_xrgb8888_to_rgb565_toio - Convert XRGB8888 to RGB565 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
> - * @swab: Swap bytes
> - *
> - * Drivers can use this function for RGB565 devices that don't natively
> - * support XRGB8888.
> - */
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab)
> -{
> - if (swab)
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_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], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> else
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> }
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_toio);
> +EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
>
> static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigned int pixels)
> {
> @@ -605,8 +593,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d
>
> } else if (dst_format == DRM_FORMAT_RGB565) {
> if (fb_format == DRM_FORMAT_XRGB8888) {
> - drm_fb_xrgb8888_to_rgb565_toio(dst[0].vaddr_iomem, dst_pitch[0],
> - vmap[0].vaddr, fb, clip, false);
> + drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, vmap, fb, clip, false);
> return 0;
> }
> } else if (dst_format == DRM_FORMAT_RGB888) {
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
> index 973a75585cad..d0bdbcb96705 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -206,7 +206,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> struct iosys_map map[DRM_FORMAT_MAX_PLANES];
> struct iosys_map data[DRM_FORMAT_MAX_PLANES];
> struct iosys_map dst_map = IOSYS_MAP_INIT_VADDR(dst);
> - void *src;
> int ret;
>
> ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
> @@ -216,7 +215,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> ret = drm_gem_fb_vmap(fb, map, data);
> if (ret)
> goto out_drm_gem_fb_end_cpu_access;
> - src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
>
> switch (fb->format->format) {
> case DRM_FORMAT_RGB565:
> @@ -226,7 +224,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> drm_fb_memcpy(&dst_map, NULL, data, fb, clip);
> break;
> case DRM_FORMAT_XRGB8888:
> - drm_fb_xrgb8888_to_rgb565(dst, 0, src, fb, clip, swap);
> + drm_fb_xrgb8888_to_rgb565(&dst_map, NULL, data, fb, clip, swap);
> break;
> default:
> drm_err_once(fb->dev, "Format is not supported: %p4cc\n",
> diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
> index 426a3ae6cc50..a43eb6645352 100644
> --- a/drivers/gpu/drm/gud/gud_pipe.c
> +++ b/drivers/gpu/drm/gud/gud_pipe.c
> @@ -198,7 +198,8 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
> } else if (format->format == DRM_FORMAT_RGB332) {
> drm_fb_xrgb8888_to_rgb332(&dst, NULL, map_data, fb, rect);
> } else if (format->format == DRM_FORMAT_RGB565) {
> - drm_fb_xrgb8888_to_rgb565(buf, 0, vaddr, fb, rect, gud_is_big_endian());
> + 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);
> } else {
> diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
> index 73fb9f63d227..9cd398e4700b 100644
> --- a/drivers/gpu/drm/tiny/cirrus.c
> +++ b/drivers/gpu/drm/tiny/cirrus.c
> @@ -335,8 +335,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> - drm_fb_xrgb8888_to_rgb565_toio(dst.vaddr_iomem, cirrus->pitch, vaddr, fb, rect,
> - false);
> + drm_fb_xrgb8888_to_rgb565(&dst, &cirrus->pitch, vmap, fb, rect, false);
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
> index 3c28f099e3ed..9f1d45d7ce84 100644
> --- a/include/drm/drm_format_helper.h
> +++ b/include/drm/drm_format_helper.h
> @@ -23,12 +23,9 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
> void drm_fb_xrgb8888_to_rgb332(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_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab);
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab);
> +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,
> --
> 2.37.1
WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: linux-hyperv@vger.kernel.org, david@lechnology.com,
airlied@linux.ie, dri-devel@lists.freedesktop.org,
maarten.lankhorst@linux.intel.com, javierm@redhat.com,
mripard@kernel.org, virtualization@lists.linux-foundation.org,
drawat.floss@gmail.com, noralf@tronnes.org, daniel@ffwll.ch,
jose.exposito89@gmail.com, airlied@redhat.com
Subject: Re: [PATCH 05/12] drm/format-helper: Rework XRGB8888-to-RGBG565 conversion
Date: Thu, 4 Aug 2022 22:12:15 +0200 [thread overview]
Message-ID: <YuwoH1GIRl8wthIY@ravnborg.org> (raw)
In-Reply-To: <20220727113312.22407-6-tzimmermann@suse.de>
On Wed, Jul 27, 2022 at 01:33:05PM +0200, Thomas Zimmermann wrote:
> Update XRGB8888-to-RGB565 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 <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/drm_format_helper.c | 59 +++++++++++------------------
> drivers/gpu/drm/drm_mipi_dbi.c | 4 +-
> drivers/gpu/drm/gud/gud_pipe.c | 3 +-
> drivers/gpu/drm/tiny/cirrus.c | 3 +-
> include/drm/drm_format_helper.h | 9 ++---
> 5 files changed, 30 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index 2b5c3746ff4a..8bf5655f5ce0 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -330,9 +330,9 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
>
> /**
> * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
> - * @dst: RGB565 destination buffer
> - * @dst_pitch: Number of bytes between two consecutive scanlines within dst
> - * @vaddr: XRGB8888 source buffer
> + * @dst: Array of RGB565 destination buffers
> + * @dst_pitch: Array of numbers of bytes between two consecutive scanlines within dst
> + * @vmap: Array of XRGB8888 source buffer
> * @fb: DRM framebuffer
> * @clip: Clip rectangle area to copy
> * @swab: Swap bytes
> @@ -340,43 +340,31 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
> * Drivers can use this function for RGB565 devices that don't natively
> * support XRGB8888.
> */
> -void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab)
> +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)
> {
> + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
> + 0, 0, 0, 0
> + };
> + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels);
> +
> if (swab)
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_line);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_swab_line;
> else
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> -}
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_line;
>
> -/**
> - * drm_fb_xrgb8888_to_rgb565_toio - Convert XRGB8888 to RGB565 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
> - * @swab: Swap bytes
> - *
> - * Drivers can use this function for RGB565 devices that don't natively
> - * support XRGB8888.
> - */
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab)
> -{
> - if (swab)
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_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], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> else
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> }
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_toio);
> +EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
>
> static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigned int pixels)
> {
> @@ -605,8 +593,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d
>
> } else if (dst_format == DRM_FORMAT_RGB565) {
> if (fb_format == DRM_FORMAT_XRGB8888) {
> - drm_fb_xrgb8888_to_rgb565_toio(dst[0].vaddr_iomem, dst_pitch[0],
> - vmap[0].vaddr, fb, clip, false);
> + drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, vmap, fb, clip, false);
> return 0;
> }
> } else if (dst_format == DRM_FORMAT_RGB888) {
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
> index 973a75585cad..d0bdbcb96705 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -206,7 +206,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> struct iosys_map map[DRM_FORMAT_MAX_PLANES];
> struct iosys_map data[DRM_FORMAT_MAX_PLANES];
> struct iosys_map dst_map = IOSYS_MAP_INIT_VADDR(dst);
> - void *src;
> int ret;
>
> ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
> @@ -216,7 +215,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> ret = drm_gem_fb_vmap(fb, map, data);
> if (ret)
> goto out_drm_gem_fb_end_cpu_access;
> - src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
>
> switch (fb->format->format) {
> case DRM_FORMAT_RGB565:
> @@ -226,7 +224,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> drm_fb_memcpy(&dst_map, NULL, data, fb, clip);
> break;
> case DRM_FORMAT_XRGB8888:
> - drm_fb_xrgb8888_to_rgb565(dst, 0, src, fb, clip, swap);
> + drm_fb_xrgb8888_to_rgb565(&dst_map, NULL, data, fb, clip, swap);
> break;
> default:
> drm_err_once(fb->dev, "Format is not supported: %p4cc\n",
> diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
> index 426a3ae6cc50..a43eb6645352 100644
> --- a/drivers/gpu/drm/gud/gud_pipe.c
> +++ b/drivers/gpu/drm/gud/gud_pipe.c
> @@ -198,7 +198,8 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
> } else if (format->format == DRM_FORMAT_RGB332) {
> drm_fb_xrgb8888_to_rgb332(&dst, NULL, map_data, fb, rect);
> } else if (format->format == DRM_FORMAT_RGB565) {
> - drm_fb_xrgb8888_to_rgb565(buf, 0, vaddr, fb, rect, gud_is_big_endian());
> + 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);
> } else {
> diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
> index 73fb9f63d227..9cd398e4700b 100644
> --- a/drivers/gpu/drm/tiny/cirrus.c
> +++ b/drivers/gpu/drm/tiny/cirrus.c
> @@ -335,8 +335,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> - drm_fb_xrgb8888_to_rgb565_toio(dst.vaddr_iomem, cirrus->pitch, vaddr, fb, rect,
> - false);
> + drm_fb_xrgb8888_to_rgb565(&dst, &cirrus->pitch, vmap, fb, rect, false);
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
> index 3c28f099e3ed..9f1d45d7ce84 100644
> --- a/include/drm/drm_format_helper.h
> +++ b/include/drm/drm_format_helper.h
> @@ -23,12 +23,9 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
> void drm_fb_xrgb8888_to_rgb332(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_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab);
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab);
> +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,
> --
> 2.37.1
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org>
To: Thomas Zimmermann <tzimmermann@suse.de>
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
Subject: Re: [PATCH 05/12] drm/format-helper: Rework XRGB8888-to-RGBG565 conversion
Date: Thu, 4 Aug 2022 22:12:15 +0200 [thread overview]
Message-ID: <YuwoH1GIRl8wthIY@ravnborg.org> (raw)
In-Reply-To: <20220727113312.22407-6-tzimmermann@suse.de>
On Wed, Jul 27, 2022 at 01:33:05PM +0200, Thomas Zimmermann wrote:
> Update XRGB8888-to-RGB565 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 <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> drivers/gpu/drm/drm_format_helper.c | 59 +++++++++++------------------
> drivers/gpu/drm/drm_mipi_dbi.c | 4 +-
> drivers/gpu/drm/gud/gud_pipe.c | 3 +-
> drivers/gpu/drm/tiny/cirrus.c | 3 +-
> include/drm/drm_format_helper.h | 9 ++---
> 5 files changed, 30 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
> index 2b5c3746ff4a..8bf5655f5ce0 100644
> --- a/drivers/gpu/drm/drm_format_helper.c
> +++ b/drivers/gpu/drm/drm_format_helper.c
> @@ -330,9 +330,9 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
>
> /**
> * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
> - * @dst: RGB565 destination buffer
> - * @dst_pitch: Number of bytes between two consecutive scanlines within dst
> - * @vaddr: XRGB8888 source buffer
> + * @dst: Array of RGB565 destination buffers
> + * @dst_pitch: Array of numbers of bytes between two consecutive scanlines within dst
> + * @vmap: Array of XRGB8888 source buffer
> * @fb: DRM framebuffer
> * @clip: Clip rectangle area to copy
> * @swab: Swap bytes
> @@ -340,43 +340,31 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
> * Drivers can use this function for RGB565 devices that don't natively
> * support XRGB8888.
> */
> -void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab)
> +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)
> {
> + static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
> + 0, 0, 0, 0
> + };
> + void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels);
> +
> if (swab)
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_line);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_swab_line;
> else
> - drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> -}
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
> + xfrm_line = drm_fb_xrgb8888_to_rgb565_line;
>
> -/**
> - * drm_fb_xrgb8888_to_rgb565_toio - Convert XRGB8888 to RGB565 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
> - * @swab: Swap bytes
> - *
> - * Drivers can use this function for RGB565 devices that don't natively
> - * support XRGB8888.
> - */
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab)
> -{
> - if (swab)
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_swab_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], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> else
> - drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
> - drm_fb_xrgb8888_to_rgb565_line);
> + drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
> + false, xfrm_line);
> }
> -EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_toio);
> +EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
>
> static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigned int pixels)
> {
> @@ -605,8 +593,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d
>
> } else if (dst_format == DRM_FORMAT_RGB565) {
> if (fb_format == DRM_FORMAT_XRGB8888) {
> - drm_fb_xrgb8888_to_rgb565_toio(dst[0].vaddr_iomem, dst_pitch[0],
> - vmap[0].vaddr, fb, clip, false);
> + drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, vmap, fb, clip, false);
> return 0;
> }
> } else if (dst_format == DRM_FORMAT_RGB888) {
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
> index 973a75585cad..d0bdbcb96705 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -206,7 +206,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> struct iosys_map map[DRM_FORMAT_MAX_PLANES];
> struct iosys_map data[DRM_FORMAT_MAX_PLANES];
> struct iosys_map dst_map = IOSYS_MAP_INIT_VADDR(dst);
> - void *src;
> int ret;
>
> ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
> @@ -216,7 +215,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> ret = drm_gem_fb_vmap(fb, map, data);
> if (ret)
> goto out_drm_gem_fb_end_cpu_access;
> - src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
>
> switch (fb->format->format) {
> case DRM_FORMAT_RGB565:
> @@ -226,7 +224,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
> drm_fb_memcpy(&dst_map, NULL, data, fb, clip);
> break;
> case DRM_FORMAT_XRGB8888:
> - drm_fb_xrgb8888_to_rgb565(dst, 0, src, fb, clip, swap);
> + drm_fb_xrgb8888_to_rgb565(&dst_map, NULL, data, fb, clip, swap);
> break;
> default:
> drm_err_once(fb->dev, "Format is not supported: %p4cc\n",
> diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
> index 426a3ae6cc50..a43eb6645352 100644
> --- a/drivers/gpu/drm/gud/gud_pipe.c
> +++ b/drivers/gpu/drm/gud/gud_pipe.c
> @@ -198,7 +198,8 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
> } else if (format->format == DRM_FORMAT_RGB332) {
> drm_fb_xrgb8888_to_rgb332(&dst, NULL, map_data, fb, rect);
> } else if (format->format == DRM_FORMAT_RGB565) {
> - drm_fb_xrgb8888_to_rgb565(buf, 0, vaddr, fb, rect, gud_is_big_endian());
> + 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);
> } else {
> diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
> index 73fb9f63d227..9cd398e4700b 100644
> --- a/drivers/gpu/drm/tiny/cirrus.c
> +++ b/drivers/gpu/drm/tiny/cirrus.c
> @@ -335,8 +335,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> - drm_fb_xrgb8888_to_rgb565_toio(dst.vaddr_iomem, cirrus->pitch, vaddr, fb, rect,
> - false);
> + drm_fb_xrgb8888_to_rgb565(&dst, &cirrus->pitch, vmap, fb, rect, false);
>
> } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
> iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
> diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
> index 3c28f099e3ed..9f1d45d7ce84 100644
> --- a/include/drm/drm_format_helper.h
> +++ b/include/drm/drm_format_helper.h
> @@ -23,12 +23,9 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
> void drm_fb_xrgb8888_to_rgb332(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_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
> - const struct drm_framebuffer *fb, const struct drm_rect *clip,
> - bool swab);
> -void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
> - const void *vaddr, const struct drm_framebuffer *fb,
> - const struct drm_rect *clip, bool swab);
> +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,
> --
> 2.37.1
next prev parent reply other threads:[~2022-08-04 20:12 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 11:33 [PATCH 00/12] drm/format-helper: Move to struct iosys_map Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` [PATCH 01/12] drm/format-helper: Provide drm_fb_blit() Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 17:02 ` Sam Ravnborg
2022-08-04 17:02 ` Sam Ravnborg
2022-08-04 17:02 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 02/12] drm/format-helper: Merge drm_fb_memcpy() and drm_fb_memcpy_toio() Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 19:52 ` Sam Ravnborg
2022-08-04 19:52 ` Sam Ravnborg
2022-08-04 19:52 ` Sam Ravnborg
2022-08-08 12:07 ` Thomas Zimmermann
2022-08-08 12:07 ` Thomas Zimmermann
2022-08-08 12:07 ` Thomas Zimmermann
2022-07-27 11:33 ` [PATCH 03/12] drm/format-helper: Convert drm_fb_swab() to struct iosys_map Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:08 ` Sam Ravnborg
2022-08-04 20:08 ` Sam Ravnborg
2022-08-04 20:08 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 04/12] drm/format-helper: Rework XRGB8888-to-RGBG332 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-28 7:13 ` José Expósito
2022-07-28 7:13 ` José Expósito
2022-07-28 7:27 ` Thomas Zimmermann
2022-07-28 7:27 ` Thomas Zimmermann
2022-07-28 7:27 ` Thomas Zimmermann
2022-07-28 17:47 ` José Expósito
2022-07-28 17:47 ` José Expósito
2022-08-04 20:10 ` Sam Ravnborg
2022-08-04 20:10 ` Sam Ravnborg
2022-08-04 20:10 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 05/12] drm/format-helper: Rework XRGB8888-to-RGBG565 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-30 12:27 ` José Expósito
2022-07-30 12:27 ` José Expósito
2022-08-04 20:12 ` Sam Ravnborg [this message]
2022-08-04 20:12 ` Sam Ravnborg
2022-08-04 20:12 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 06/12] drm/format-helper: Rework XRGB8888-to-RGB888 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:14 ` Sam Ravnborg
2022-08-04 20:14 ` Sam Ravnborg
2022-08-04 20:14 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 07/12] drm/format-helper: Rework RGB565-to-XRGB8888 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:15 ` Sam Ravnborg
2022-08-04 20:15 ` Sam Ravnborg
2022-08-04 20:15 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 08/12] drm/format-helper: Rework RGB888-to-XRGB8888 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:16 ` Sam Ravnborg
2022-08-04 20:16 ` Sam Ravnborg
2022-08-04 20:16 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 09/12] drm/format-helper: Rework XRGB8888-to-XRGB2101010 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:17 ` Sam Ravnborg
2022-08-04 20:17 ` Sam Ravnborg
2022-08-04 20:17 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 10/12] drm/format-helper: Rework XRGB8888-to-GRAY8 conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:19 ` Sam Ravnborg
2022-08-04 20:19 ` Sam Ravnborg
2022-08-04 20:19 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 11/12] drm/format-helper: Rework XRGB8888-to-MONO conversion Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-08-04 20:21 ` Sam Ravnborg
2022-08-04 20:21 ` Sam Ravnborg
2022-08-04 20:21 ` Sam Ravnborg
2022-07-27 11:33 ` [PATCH 12/12] drm/format-helper: Move destination-buffer handling into internal helper Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-27 11:33 ` Thomas Zimmermann
2022-07-28 7:26 ` José Expósito
2022-07-28 7:26 ` José Expósito
2022-07-28 7:45 ` Thomas Zimmermann
2022-07-28 7:45 ` Thomas Zimmermann
2022-07-28 7:45 ` Thomas Zimmermann
2022-07-28 18:23 ` José Expósito
2022-07-28 18:23 ` José Expósito
2022-08-05 17:52 ` Sam Ravnborg
2022-08-05 17:52 ` Sam Ravnborg
2022-08-05 17:52 ` Sam Ravnborg
2022-08-08 11:40 ` Thomas Zimmermann
2022-08-08 11:40 ` Thomas Zimmermann
2022-08-08 11:40 ` Thomas Zimmermann
2022-08-08 18:25 ` Sam Ravnborg
2022-08-08 18:25 ` Sam Ravnborg
2022-08-08 18:25 ` Sam Ravnborg
2022-08-05 17:59 ` [PATCH 00/12] drm/format-helper: Move to struct iosys_map Sam Ravnborg
2022-08-05 17:59 ` Sam Ravnborg
2022-08-05 17:59 ` Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YuwoH1GIRl8wthIY@ravnborg.org \
--to=sam@ravnborg.org \
--cc=airlied@linux.ie \
--cc=airlied@redhat.com \
--cc=daniel@ffwll.ch \
--cc=david@lechnology.com \
--cc=drawat.floss@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=jose.exposito89@gmail.com \
--cc=kraxel@redhat.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=noralf@tronnes.org \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.