]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
drm: vc4: adapt to new behaviour of drm_crtc.c
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Wed, 1 Feb 2017 09:35:08 +0000 (10:35 +0100)
committerEric Anholt <eric@anholt.net>
Wed, 8 Feb 2017 22:19:23 +0000 (14:19 -0800)
commit49d29a077af8d2ee3b291ccd8d053541bebe09d7
treee309cf9bca9fc9c8d2f9e87757aa4901deefc727
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
drm: vc4: adapt to new behaviour of drm_crtc.c

When drm_crtc_init_with_planes() was orignally added
(in drm_crtc.c, e13161af80c185ecd8dc4641d0f5df58f9e3e0af
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
(fc1d3e44ef7c1db93384150fdbf8948dcf949f15 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
(7abc7d47510c75dd984380ebf819616e574c9604 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 <andrzej.p@samsung.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/1485941708-27892-1-git-send-email-andrzej.p@samsung.com
Fixes: 7abc7d47510c ("drm: don't override possible_crtcs for primary/cursor planes")
drivers/gpu/drm/vc4/vc4_plane.c