Unverified Commit 9a011053 authored by Simon Ser's avatar Simon Ser
Browse files

drm: warn if cursor plane is set with legacy funcs 



A driver must not set drm_crtc.cursor and any of the legacy funcs at the
same time, otherwise it's not clear which one DRM core should use for
legacy cursor updates.

Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201222134002.161613-1-contact@emersion.fr
parent 1f20bf59

drivers/gpu/drm/drm_mode_config.c

+10 −0
Original line number Diff line number Diff line
@@ -645,6 +645,16 @@ void drm_mode_config_validate(struct drm_device *dev) 
		WARN(!crtc->primary, "Missing primary plane on [CRTC:%d:%s]\n",

		     crtc->base.id, crtc->name);



		WARN(crtc->cursor && crtc->funcs->cursor_set,

		     "[CRTC:%d:%s] must not have both a cursor plane and a cursor_set func",

		     crtc->base.id, crtc->name);

		WARN(crtc->cursor && crtc->funcs->cursor_set2,

		     "[CRTC:%d:%s] must not have both a cursor plane and a cursor_set2 func",

		     crtc->base.id, crtc->name);

		WARN(crtc->cursor && crtc->funcs->cursor_move,

		     "[CRTC:%d:%s] must not have both a cursor plane and a cursor_move func",

		     crtc->base.id, crtc->name);



		if (crtc->primary) {

			WARN(!(crtc->primary->possible_crtcs & drm_crtc_mask(crtc)),

			     "Bogus primary plane possible_crtcs: [PLANE:%d:%s] must be compatible with [CRTC:%d:%s]\n",