drm/gud: Add GUD_PIXEL_FORMAT_RGB332

Add support for the RGB332 pixel format.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210929191201.34456-6-noralf@tronnes.org

diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c
index a8d76c7..e571ad1 100644 (file)
--- a/drivers/gpu/drm/gud/gud_drv.c
+++ b/drivers/gpu/drm/gud/gud_drv.c
@@ -526,6 +526,8 @@ static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id)
                case DRM_FORMAT_R8:
                        fallthrough;
                case GUD_DRM_FORMAT_XRGB1111:
+                       fallthrough;
+               case DRM_FORMAT_RGB332:
                        if (!xrgb8888_emulation_format)
                                xrgb8888_emulation_format = info;
                        break;

diff --git a/drivers/gpu/drm/gud/gud_internal.h b/drivers/gpu/drm/gud/gud_internal.h
index 8499e71..249e02d 100644 (file)
--- a/drivers/gpu/drm/gud/gud_internal.h
+++ b/drivers/gpu/drm/gud/gud_internal.h
@@ -84,6 +84,8 @@ static inline u8 gud_from_fourcc(u32 fourcc)
                return GUD_PIXEL_FORMAT_R8;
        case GUD_DRM_FORMAT_XRGB1111:
                return GUD_PIXEL_FORMAT_XRGB1111;
+       case DRM_FORMAT_RGB332:
+               return GUD_PIXEL_FORMAT_RGB332;
        case DRM_FORMAT_RGB565:
                return GUD_PIXEL_FORMAT_RGB565;
        case DRM_FORMAT_XRGB8888:
@@ -104,6 +106,8 @@ static inline u32 gud_to_fourcc(u8 format)
                return DRM_FORMAT_R8;
        case GUD_PIXEL_FORMAT_XRGB1111:
                return GUD_DRM_FORMAT_XRGB1111;
+       case GUD_PIXEL_FORMAT_RGB332:
+               return DRM_FORMAT_RGB332;
        case GUD_PIXEL_FORMAT_RGB565:
                return DRM_FORMAT_RGB565;
        case GUD_PIXEL_FORMAT_XRGB8888:

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index be4f95b..868a0b8 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -191,6 +191,8 @@ retry:
                        }
                } else if (format->format == DRM_FORMAT_R8) {
                        drm_fb_xrgb8888_to_gray8(buf, vaddr, fb, rect);
+               } else if (format->format == DRM_FORMAT_RGB332) {
+                       drm_fb_xrgb8888_to_rgb332(buf, vaddr, fb, rect);
                } else if (format->format == DRM_FORMAT_RGB565) {
                        drm_fb_xrgb8888_to_rgb565(buf, vaddr, fb, rect, gud_is_big_endian());
                } else {

diff --git a/include/drm/gud.h b/include/drm/gud.h
index 1dc7810..4118dce 100644 (file)
--- a/include/drm/gud.h
+++ b/include/drm/gud.h
@@ -249,6 +249,7 @@ struct gud_state_req {
   #define GUD_PIXEL_FORMAT_R1                  0x01 /* 1-bit monochrome */
   #define GUD_PIXEL_FORMAT_R8                  0x08 /* 8-bit greyscale */
   #define GUD_PIXEL_FORMAT_XRGB1111            0x20
+  #define GUD_PIXEL_FORMAT_RGB332              0x30
   #define GUD_PIXEL_FORMAT_RGB565              0x40
   #define GUD_PIXEL_FORMAT_XRGB8888            0x80
   #define GUD_PIXEL_FORMAT_ARGB8888            0x81