mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
2909cce1b2
Removed upstreamed: bcm27xx/patches-6.1/950-1235-drm-vc4-don-t-check-if-plane-state-fb-state-fb.patch [1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.86&id=48bfb4b03c5ff6e1fa1dc73fb915e150b0968c40 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
105 lines
3.0 KiB
Diff
105 lines
3.0 KiB
Diff
From db4cb2248e9d98cc513300964c3ecdc80b8bc364 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 3 Jun 2022 16:57:04 +0100
|
|
Subject: [PATCH] drm: vc4: Add 3:3:2 and 4:4:4:4 RGB/RGBX/RGBA formats
|
|
|
|
The hardware supports the 332 8bpp and 4:4:4:4 16bpp formats,
|
|
but the table of supported formats didn't include them.
|
|
Add them in.
|
|
|
|
In theory they are supported for T-format as well as linear,
|
|
but without a way to test them just add them as linear for now.
|
|
|
|
Suggested-by: vrazzer <teamvraz@pipmail.net>
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 70 +++++++++++++++++++++++++++++++++
|
|
1 file changed, 70 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -175,6 +175,66 @@ static const struct hvs_format {
|
|
.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
|
|
.hvs5_only = true,
|
|
},
|
|
+ {
|
|
+ .drm = DRM_FORMAT_RGB332,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGB332,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ARGB,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_BGR233,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGB332,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ABGR,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_XRGB4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ABGR,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_ARGB4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ABGR,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_XBGR4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ARGB,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_ABGR4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_ARGB,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_BGRX4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_RGBA,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_BGRA,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_BGRA4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_RGBA,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_BGRA,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_RGBX4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_BGRA,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_RGBA,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_RGBA4444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_RGBA4444,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_BGRA,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_RGBA,
|
|
+ },
|
|
};
|
|
|
|
static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
|
|
@@ -1572,6 +1632,16 @@ static bool vc4_format_mod_supported(str
|
|
case DRM_FORMAT_BGRX1010102:
|
|
case DRM_FORMAT_RGBA1010102:
|
|
case DRM_FORMAT_BGRA1010102:
|
|
+ case DRM_FORMAT_XRGB4444:
|
|
+ case DRM_FORMAT_ARGB4444:
|
|
+ case DRM_FORMAT_XBGR4444:
|
|
+ case DRM_FORMAT_ABGR4444:
|
|
+ case DRM_FORMAT_RGBX4444:
|
|
+ case DRM_FORMAT_RGBA4444:
|
|
+ case DRM_FORMAT_BGRX4444:
|
|
+ case DRM_FORMAT_BGRA4444:
|
|
+ case DRM_FORMAT_RGB332:
|
|
+ case DRM_FORMAT_BGR233:
|
|
case DRM_FORMAT_YUV422:
|
|
case DRM_FORMAT_YVU422:
|
|
case DRM_FORMAT_YUV420:
|