drm/gud: Add GUD_PIXEL_FORMAT_R8

Add support for 8-bit greyscale 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-5-noralf@tronnes.org

diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c
index eb4e08846da452af38d2cb01a087443c6e6ebb6c..a8d76c76e8683d35ae8b5ecb2aaeea1805f233bd 100644 (file)
--- a/drivers/gpu/drm/gud/gud_drv.c
+++ b/drivers/gpu/drm/gud/gud_drv.c
@@ -523,6 +523,8 @@ static int gud_probe(struct usb_interface *intf, const struct usb_device_id *id)
                switch (format) {
                case GUD_DRM_FORMAT_R1:
                        fallthrough;
+               case DRM_FORMAT_R8:
+                       fallthrough;
                case GUD_DRM_FORMAT_XRGB1111:
                        if (!xrgb8888_emulation_format)
                                xrgb8888_emulation_format = info;

diff --git a/drivers/gpu/drm/gud/gud_internal.h b/drivers/gpu/drm/gud/gud_internal.h
index 2a388e27d5d7bf3589f114bf5fe3fec15fa2b7f0..8499e713dbbc5cb413587e99c24bc4b3fb254761 100644 (file)
--- a/drivers/gpu/drm/gud/gud_internal.h
+++ b/drivers/gpu/drm/gud/gud_internal.h
@@ -80,6 +80,8 @@ static inline u8 gud_from_fourcc(u32 fourcc)
        switch (fourcc) {
        case GUD_DRM_FORMAT_R1:
                return GUD_PIXEL_FORMAT_R1;
+       case DRM_FORMAT_R8:
+               return GUD_PIXEL_FORMAT_R8;
        case GUD_DRM_FORMAT_XRGB1111:
                return GUD_PIXEL_FORMAT_XRGB1111;
        case DRM_FORMAT_RGB565:
@@ -98,6 +100,8 @@ static inline u32 gud_to_fourcc(u8 format)
        switch (format) {
        case GUD_PIXEL_FORMAT_R1:
                return GUD_DRM_FORMAT_R1;
+       case GUD_PIXEL_FORMAT_R8:
+               return DRM_FORMAT_R8;
        case GUD_PIXEL_FORMAT_XRGB1111:
                return GUD_DRM_FORMAT_XRGB1111;
        case GUD_PIXEL_FORMAT_RGB565:

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index b9b0e435ea0fa7dcaae0639612830d372be251ca..be4f95b2d59c5ab0fd91da598b73487513c5b34f 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -189,6 +189,8 @@ retry:
                                ret = -ENOMEM;
                                goto end_cpu_access;
                        }
+               } else if (format->format == DRM_FORMAT_R8) {
+                       drm_fb_xrgb8888_to_gray8(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 0b46b54fe56ef4bd96dd3f8a8597f13b35e68e9b..1dc781009e628c4b06f68a5b11fdd0d63992f652 100644 (file)
--- a/include/drm/gud.h
+++ b/include/drm/gud.h
@@ -246,8 +246,8 @@ struct gud_state_req {
 /* Get supported pixel formats as a byte array of GUD_PIXEL_FORMAT_* */
 #define GUD_REQ_GET_FORMATS                            0x40
   #define GUD_FORMATS_MAX_NUM                  32
-  /* R1 is a 1-bit monochrome transfer format presented to userspace as XRGB8888 */
-  #define GUD_PIXEL_FORMAT_R1                  0x01
+  #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_RGB565              0x40
   #define GUD_PIXEL_FORMAT_XRGB8888            0x80