Skip to content

drm/vc4: plane: Swap Cb/Cr pointers for YVU formats #7122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 3, 2025
+14 −1
Merged

drm/vc4: plane: Swap Cb/Cr pointers for YVU formats #7122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion drivers/gpu/drm/vc4/vc4_plane.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static const struct hvs_format {
u32 pixel_order_hvs5;
bool hvs5_only;
bool hvs6_only;
bool hvs6_swap_chroma_pointers;
} hvs_formats[] = {
{
.drm = DRM_FORMAT_XRGB8888,
Expand Down Expand Up @@ -109,6 +110,7 @@ static const struct hvs_format {
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
.hvs6_swap_chroma_pointers = true,
},
{
.drm = DRM_FORMAT_YUV444,
Expand All @@ -121,6 +123,7 @@ static const struct hvs_format {
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
.hvs6_swap_chroma_pointers = true,
},
{
.drm = DRM_FORMAT_YUV420,
Expand All @@ -133,6 +136,7 @@ static const struct hvs_format {
.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
.hvs6_swap_chroma_pointers = true,
},
{
.drm = DRM_FORMAT_NV12,
Expand Down Expand Up @@ -1870,6 +1874,14 @@ static u32 vc6_plane_get_csc_mode(struct vc4_plane_state *vc4_state)
return ret;
}

static int vc6_get_plane_idx(const struct hvs_format *format, int plane)
{
if (!plane || !format->hvs6_swap_chroma_pointers)
return plane;

return (plane == 1) ? 2 : 1;
}

static int vc6_plane_mode_set(struct drm_plane *plane,
struct drm_plane_state *state)
{
Expand Down Expand Up @@ -2162,7 +2174,8 @@ static int vc6_plane_mode_set(struct drm_plane *plane,
* TODO: This only covers Raster Scan Order planes
*/
for (i = 0; i < num_planes; i++) {
struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, i);
struct drm_gem_dma_object *bo =
drm_fb_dma_get_gem_obj(fb, vc6_get_plane_idx(format, i));
dma_addr_t paddr = bo->dma_addr + fb->offsets[i] + offsets[i];

/* Pointer Word 0 */
Expand Down