forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From fb2081692fb040f6260e008272c9f6cb155c9a77 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Tue, 31 Jan 2023 15:14:32 +0000
|
|
Subject: [PATCH 0034/1085] drm/vc4_plane: Add support for YUV444 formats
|
|
|
|
Support displaying DRM_FORMAT_YUV444 and DRM_FORMAT_YVU444 formats.
|
|
Tested with kmstest and kodi. e.g.
|
|
|
|
kmstest -r 1920x1080@60 -f 400x300-YU24
|
|
|
|
Note: without the shift of width, only half the chroma is fetched,
|
|
resulting in correct left half of image and corrupt colours on right half.
|
|
|
|
The increase in width shouldn't affect fetching of Y data,
|
|
as the hardware will clamp at dest width.
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
|
@@ -110,6 +110,18 @@ static const struct hvs_format {
|
|
.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
|
|
},
|
|
{
|
|
+ .drm = DRM_FORMAT_YUV444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
|
|
+ },
|
|
+ {
|
|
+ .drm = DRM_FORMAT_YVU444,
|
|
+ .hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
|
|
+ .pixel_order = HVS_PIXEL_ORDER_XYCRCB,
|
|
+ .pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
|
|
+ },
|
|
+ {
|
|
.drm = DRM_FORMAT_YUV420,
|
|
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
|
|
.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
|
|
@@ -1106,6 +1118,10 @@ static int vc4_plane_mode_set(struct drm
|
|
vc4_state->src_y + vc4_state->src_h[0] < (state->fb->height << 16))
|
|
height++;
|
|
|
|
+ /* for YUV444 hardware wants double the width, otherwise it doesn't fetch full width of chroma */
|
|
+ if (format->drm == DRM_FORMAT_YUV444 || format->drm == DRM_FORMAT_YVU444)
|
|
+ width <<= 1;
|
|
+
|
|
/* Don't waste cycles mixing with plane alpha if the set alpha
|
|
* is opaque or there is no per-pixel alpha information.
|
|
* In any case we use the alpha property value as the fixed alpha.
|