Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e7de761 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Clear crtc->primary->crtc when disabling the crtc via setcrtc() 



Keep the primary->crtc in sync with the state->crtc (also with
primary->fb and state->fb) when disabling the crtc (and thus also
the primary) via setcrtc().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180322152313.6561-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 5e9cfeba

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int __drm_mode_set_config_internal(struct drm_mode_set *set, 


	ret = crtc->funcs->set_config(set, ctx);

	if (ret == 0) {

		crtc->primary->crtc = crtc;

		crtc->primary->crtc = fb ? crtc : NULL;

		crtc->primary->fb = fb;

	}