Skip to contentSkip to conversation

drm/vc4: Fix YUV plane handling when planes are in different buffers

PATCH Applied Maxime Ripard 1 participant 2 messages Jan 27, 2023 – Feb 9, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/vc4: Fix YUV plane handling when planes are in different buffers

From: Dave Stevenson <[email protected]>

YUV images can either be presented as one allocation with offsets for the different planes, or multiple allocations with 0 offsets.

The driver only ever calls drm_fb_[dma|cma]_get_gem_obj with plane index 0, therefore any application using the second approach was incorrectly rendered.

Correctly determine the address for each plane, removing the assumption that the base address is the same for each.

Fixes fc04023fafec ("drm/vc4: Add support for YUV planes.")
---
 drivers/gpu/drm/vc4/vc4_plane.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +4 -2
index dee525bacd4b..97c84a3f5a46 100644
@@ -438,7 +438,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
 {
 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
 	struct drm_framebuffer *fb = state->fb;
-	struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, 0);
+	struct drm_gem_dma_object *bo;
 	int num_planes = fb->format->num_planes;
 	struct drm_crtc_state *crtc_state;
 	u32 h_subsample = fb->format->hsub;
@@ -457,8 +457,10 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
 	if (ret)
 		return ret;
 
-	for (i = 0; i < num_planes; i++)
+	for (i = 0; i < num_planes; i++) {
+		bo = drm_fb_dma_get_gem_obj(fb, i);
 		vc4_state->offsets[i] = bo->dma_addr + fb->offsets[i];
+	}
 
 	/*
 	 * We don't support subpixel source positioning for scaling,
Signature · 1 line
2.39.1
author Applied
#1 lore raw

Re: (subset) [PATCH] drm/vc4: Fix YUV plane handling when planes are in different buffers

Quoted 8 lines · Maxime Ripard

YUV images can either be presented as one allocation with offsets for the different planes, or multiple allocations with 0 offsets.

The driver only ever calls drm_fb_[dma|cma]_get_gem_obj with plane index 0, therefore any application using the second approach was incorrectly rendered.

[...]

Applied to drm/drm-misc (drm-misc-fixes).

Thanks!
Maxime