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

Commit 4be40c98 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Zero the mode in intel_sanitize_crtc when force disabling. 



There is a WARN_ON in drm_atomic_crtc_check for this when exposing the atomic property.
If the mode_blob still exists, but enable = false then all updates are rejected with -EINVAL.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b06f8b0d

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15291,7 +15291,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) 
			      crtc->base.state->enable ? "enabled" : "disabled",

			      crtc->base.state->enable ? "enabled" : "disabled",

			      crtc->active ? "enabled" : "disabled");

			      crtc->active ? "enabled" : "disabled");





		crtc->base.state->enable = crtc->active;

		WARN_ON(drm_atomic_set_mode_for_crtc(crtc->base.state, NULL) < 0);

		crtc->base.state->active = crtc->active;

		crtc->base.state->active = crtc->active;

		crtc->base.enabled = crtc->active;

		crtc->base.enabled = crtc->active;