diff options
author | Dave Airlie <airlied@redhat.com> | 2023-11-02 11:52:50 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-11-02 11:52:55 +1000 |
commit | 2ba446f82142d0d42fc5ea7bea7af581d33a7939 (patch) | |
tree | be4261ef1c450e33af821db45b93edb706a708ff /include/uapi/linux | |
parent | 631808095a82e6b6f8410a95f8b12b8d0d38b161 (diff) | |
parent | 1399ebacbf590dfbac4fbba181dd1595b2fa10ba (diff) | |
download | linux-stable-2ba446f82142d0d42fc5ea7bea7af581d33a7939.tar.gz linux-stable-2ba446f82142d0d42fc5ea7bea7af581d33a7939.tar.bz2 linux-stable-2ba446f82142d0d42fc5ea7bea7af581d33a7939.zip |
Merge tag 'shmob-drm-atomic-dt-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into drm-next
drm: renesas: shmobile: Atomic conversion + DT support
Currently, there are two drivers for the LCD controller on Renesas
SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
1. sh_mobile_lcdcfb, using the fbdev framework,
2. shmob_drm, using the DRM framework.
However, only the former driver is used, as all platform support
integrates the former. None of these drivers support DT-based systems.
Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
support, complemented by the customary set of fixes and improvements.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/cover.1694767208.git.geert+renesas@glider.be/
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://patchwork.freedesktop.org/patch/msgid/CAMuHMdUF61V5qNyKbrTGxZfEJvCVuLO7q2R5MqZYkzRC_cNr0w@mail.gmail.com
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/media-bus-format.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h index a03c543cb072..f05f747e444d 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -34,7 +34,7 @@ #define MEDIA_BUS_FMT_FIXED 0x0001 -/* RGB - next is 0x1025 */ +/* RGB - next is 0x1026 */ #define MEDIA_BUS_FMT_RGB444_1X12 0x1016 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 @@ -46,6 +46,7 @@ #define MEDIA_BUS_FMT_RGB565_2X8_BE 0x1007 #define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 #define MEDIA_BUS_FMT_RGB666_1X18 0x1009 +#define MEDIA_BUS_FMT_RGB666_2X9_BE 0x1025 #define MEDIA_BUS_FMT_BGR666_1X18 0x1023 #define MEDIA_BUS_FMT_RBG888_1X24 0x100e #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI 0x1015 |