Skip to content

Commit 49d29a0

Browse files
Andrzej Pietrasiewiczanholt
authored andcommitted
drm: vc4: adapt to new behaviour of drm_crtc.c
When drm_crtc_init_with_planes() was orignally added (in drm_crtc.c, e13161a drm: Add drm_crtc_init_with_planes() (v2)), it only checked for "primary" being non-null. If that was the case, it modified primary->possible_crtcs. Then, when support for cursor planes was added (fc1d3e4 drm: Allow drivers to register cursor planes with crtc), the same behaviour was implemented for cursor planes. vc4_plane_init() since its inception has passed 0xff as "possible_crtcs" parameter to drm_universal_plane_init(). With a change in drm_crtc.c (7abc7d4 drm: don't override possible_crtcs for primary/cursor planes) passing 0xff results in primary's possible_crtcs set to 0xff (cursor was updated manually by vc4_crtc.c). Consequently, it would be allowed to use the primary plane from CRTC 1 (for example) on CRTC 0, which would result in the overlay and cursors being buried. Signed-off-by: Andrzej Pietrasiewicz <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected] Fixes: 7abc7d4 ("drm: don't override possible_crtcs for primary/cursor planes")
1 parent d5adbfc commit 49d29a0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/vc4/vc4_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
858858
}
859859
}
860860
plane = &vc4_plane->base;
861-
ret = drm_universal_plane_init(dev, plane, 0xff,
861+
ret = drm_universal_plane_init(dev, plane, 0,
862862
&vc4_plane_funcs,
863863
formats, num_formats,
864864
type, NULL);

0 commit comments

Comments
 (0)