[PATCH 1/8] drm/format-helper: Move helpers for pixel conversion to header file
Jocelyn Falempe
jfalempe at redhat.com
Wed Mar 26 08:51:26 UTC 2025
On 25/03/2025 11:31, Thomas Zimmermann wrote:
> The DRM draw helpers contain format-conversion helpers that operate
> on individual pixels. Move them into an internal header file and adopt
> them as individual API. Update the draw code accordingly. The pixel
> helpers will also be useful for other format conversion helpers.
Thanks, it looks good to me.
Reviewed-by: Jocelyn Falempe <jfalempe at redhat.com>
>
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
> drivers/gpu/drm/drm_draw.c | 100 +++-------------------
> drivers/gpu/drm/drm_format_internal.h | 119 ++++++++++++++++++++++++++
> 2 files changed, 130 insertions(+), 89 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_format_internal.h
>
> diff --git a/drivers/gpu/drm/drm_draw.c b/drivers/gpu/drm/drm_draw.c
> index cb2ad12bce57..d41f8ae1c148 100644
> --- a/drivers/gpu/drm/drm_draw.c
> +++ b/drivers/gpu/drm/drm_draw.c
> @@ -11,85 +11,7 @@
> #include <drm/drm_fourcc.h>
>
> #include "drm_draw_internal.h"
> -
> -/*
> - * Conversions from xrgb8888
> - */
> -
> -static u16 convert_xrgb8888_to_rgb565(u32 pix)
> -{
> - return ((pix & 0x00F80000) >> 8) |
> - ((pix & 0x0000FC00) >> 5) |
> - ((pix & 0x000000F8) >> 3);
> -}
> -
> -static u16 convert_xrgb8888_to_rgba5551(u32 pix)
> -{
> - return ((pix & 0x00f80000) >> 8) |
> - ((pix & 0x0000f800) >> 5) |
> - ((pix & 0x000000f8) >> 2) |
> - BIT(0); /* set alpha bit */
> -}
> -
> -static u16 convert_xrgb8888_to_xrgb1555(u32 pix)
> -{
> - return ((pix & 0x00f80000) >> 9) |
> - ((pix & 0x0000f800) >> 6) |
> - ((pix & 0x000000f8) >> 3);
> -}
> -
> -static u16 convert_xrgb8888_to_argb1555(u32 pix)
> -{
> - return BIT(15) | /* set alpha bit */
> - ((pix & 0x00f80000) >> 9) |
> - ((pix & 0x0000f800) >> 6) |
> - ((pix & 0x000000f8) >> 3);
> -}
> -
> -static u32 convert_xrgb8888_to_argb8888(u32 pix)
> -{
> - return pix | GENMASK(31, 24); /* fill alpha bits */
> -}
> -
> -static u32 convert_xrgb8888_to_xbgr8888(u32 pix)
> -{
> - return ((pix & 0x00ff0000) >> 16) << 0 |
> - ((pix & 0x0000ff00) >> 8) << 8 |
> - ((pix & 0x000000ff) >> 0) << 16 |
> - ((pix & 0xff000000) >> 24) << 24;
> -}
> -
> -static u32 convert_xrgb8888_to_abgr8888(u32 pix)
> -{
> - return ((pix & 0x00ff0000) >> 16) << 0 |
> - ((pix & 0x0000ff00) >> 8) << 8 |
> - ((pix & 0x000000ff) >> 0) << 16 |
> - GENMASK(31, 24); /* fill alpha bits */
> -}
> -
> -static u32 convert_xrgb8888_to_xrgb2101010(u32 pix)
> -{
> - pix = ((pix & 0x000000FF) << 2) |
> - ((pix & 0x0000FF00) << 4) |
> - ((pix & 0x00FF0000) << 6);
> - return pix | ((pix >> 8) & 0x00300C03);
> -}
> -
> -static u32 convert_xrgb8888_to_argb2101010(u32 pix)
> -{
> - pix = ((pix & 0x000000FF) << 2) |
> - ((pix & 0x0000FF00) << 4) |
> - ((pix & 0x00FF0000) << 6);
> - return GENMASK(31, 30) /* set alpha bits */ | pix | ((pix >> 8) & 0x00300C03);
> -}
> -
> -static u32 convert_xrgb8888_to_abgr2101010(u32 pix)
> -{
> - pix = ((pix & 0x00FF0000) >> 14) |
> - ((pix & 0x0000FF00) << 4) |
> - ((pix & 0x000000FF) << 22);
> - return GENMASK(31, 30) /* set alpha bits */ | pix | ((pix >> 8) & 0x00300C03);
> -}
> +#include "drm_format_internal.h"
>
> /**
> * drm_draw_color_from_xrgb8888 - convert one pixel from xrgb8888 to the desired format
> @@ -104,28 +26,28 @@ u32 drm_draw_color_from_xrgb8888(u32 color, u32 format)
> {
> switch (format) {
> case DRM_FORMAT_RGB565:
> - return convert_xrgb8888_to_rgb565(color);
> + return drm_pixel_xrgb8888_to_rgb565(color);
> case DRM_FORMAT_RGBA5551:
> - return convert_xrgb8888_to_rgba5551(color);
> + return drm_pixel_xrgb8888_to_rgba5551(color);
> case DRM_FORMAT_XRGB1555:
> - return convert_xrgb8888_to_xrgb1555(color);
> + return drm_pixel_xrgb8888_to_xrgb1555(color);
> case DRM_FORMAT_ARGB1555:
> - return convert_xrgb8888_to_argb1555(color);
> + return drm_pixel_xrgb8888_to_argb1555(color);
> case DRM_FORMAT_RGB888:
> case DRM_FORMAT_XRGB8888:
> return color;
> case DRM_FORMAT_ARGB8888:
> - return convert_xrgb8888_to_argb8888(color);
> + return drm_pixel_xrgb8888_to_argb8888(color);
> case DRM_FORMAT_XBGR8888:
> - return convert_xrgb8888_to_xbgr8888(color);
> + return drm_pixel_xrgb8888_to_xbgr8888(color);
> case DRM_FORMAT_ABGR8888:
> - return convert_xrgb8888_to_abgr8888(color);
> + return drm_pixel_xrgb8888_to_abgr8888(color);
> case DRM_FORMAT_XRGB2101010:
> - return convert_xrgb8888_to_xrgb2101010(color);
> + return drm_pixel_xrgb8888_to_xrgb2101010(color);
> case DRM_FORMAT_ARGB2101010:
> - return convert_xrgb8888_to_argb2101010(color);
> + return drm_pixel_xrgb8888_to_argb2101010(color);
> case DRM_FORMAT_ABGR2101010:
> - return convert_xrgb8888_to_abgr2101010(color);
> + return drm_pixel_xrgb8888_to_abgr2101010(color);
> default:
> WARN_ONCE(1, "Can't convert to %p4cc\n", &format);
> return 0;
> diff --git a/drivers/gpu/drm/drm_format_internal.h b/drivers/gpu/drm/drm_format_internal.h
> new file mode 100644
> index 000000000000..5f82f0b9c8e8
> --- /dev/null
> +++ b/drivers/gpu/drm/drm_format_internal.h
> @@ -0,0 +1,119 @@
> +/* SPDX-License-Identifier: GPL-2.0 or MIT */
> +
> +#ifndef DRM_FORMAT_INTERNAL_H
> +#define DRM_FORMAT_INTERNAL_H
> +
> +#include <linux/bits.h>
> +#include <linux/types.h>
> +
> +/*
> + * Each pixel-format conversion helper takes a raw pixel in a
> + * specific input format and returns a raw pixel in a specific
> + * output format. All pixels are in little-endian byte order.
> + *
> + * Function names are
> + *
> + * drm_pixel_<input>_to_<output>_<algorithm>()
> + *
> + * where <input> and <output> refer to pixel formats. The
> + * <algorithm> is optional and hints to the method used for the
> + * conversion. Helpers with no algorithm given apply pixel-bit
> + * shifting.
> + *
> + * The argument type is u32. We expect this to be wide enough to
> + * hold all conversion input from 32-bit RGB to any output format.
> + * The Linux kernel should avoid format conversion for anything
> + * but XRGB8888 input data. Converting from other format can still
> + * be acceptable in some cases.
> + *
> + * The return type is u32. It is wide enough to hold all conversion
> + * output from XRGB8888. For output formats wider than 32 bit, a
> + * return type of u64 would be acceptable.
> + */
> +
> +/*
> + * Conversions from XRGB8888
> + */
> +
> +static inline u32 drm_pixel_xrgb8888_to_rgb565(u32 pix)
> +{
> + return ((pix & 0x00f80000) >> 8) |
> + ((pix & 0x0000fc00) >> 5) |
> + ((pix & 0x000000f8) >> 3);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_rgbx5551(u32 pix)
> +{
> + return ((pix & 0x00f80000) >> 8) |
> + ((pix & 0x0000f800) >> 5) |
> + ((pix & 0x000000f8) >> 2);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_rgba5551(u32 pix)
> +{
> + return drm_pixel_xrgb8888_to_rgbx5551(pix) |
> + BIT(0); /* set alpha bit */
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_xrgb1555(u32 pix)
> +{
> + return ((pix & 0x00f80000) >> 9) |
> + ((pix & 0x0000f800) >> 6) |
> + ((pix & 0x000000f8) >> 3);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_argb1555(u32 pix)
> +{
> + return BIT(15) | /* set alpha bit */
> + drm_pixel_xrgb8888_to_xrgb1555(pix);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_argb8888(u32 pix)
> +{
> + return GENMASK(31, 24) | /* fill alpha bits */
> + pix;
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_xbgr8888(u32 pix)
> +{
> + return ((pix & 0xff000000)) | /* also copy filler bits */
> + ((pix & 0x00ff0000) >> 16) |
> + ((pix & 0x0000ff00)) |
> + ((pix & 0x000000ff) << 16);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_abgr8888(u32 pix)
> +{
> + return GENMASK(31, 24) | /* fill alpha bits */
> + drm_pixel_xrgb8888_to_xbgr8888(pix);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_xrgb2101010(u32 pix)
> +{
> + pix = ((pix & 0x000000ff) << 2) |
> + ((pix & 0x0000ff00) << 4) |
> + ((pix & 0x00ff0000) << 6);
> + return pix | ((pix >> 8) & 0x00300c03);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_argb2101010(u32 pix)
> +{
> + return GENMASK(31, 30) | /* set alpha bits */
> + drm_pixel_xrgb8888_to_xrgb2101010(pix);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_xbgr2101010(u32 pix)
> +{
> + pix = ((pix & 0x00ff0000) >> 14) |
> + ((pix & 0x0000ff00) << 4) |
> + ((pix & 0x000000ff) << 22);
> + return pix | ((pix >> 8) & 0x00300c03);
> +}
> +
> +static inline u32 drm_pixel_xrgb8888_to_abgr2101010(u32 pix)
> +{
> + return GENMASK(31, 30) | /* set alpha bits */
> + drm_pixel_xrgb8888_to_xbgr2101010(pix);
> +}
> +
> +#endif
More information about the dri-devel
mailing list