diff mbox

[2/3] drm/i915: Zero the mode in intel_sanitize_crtc when force disabling.

Message ID 55A4F65C.8080607@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst July 14, 2015, 11:45 a.m. UTC
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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Stone July 14, 2015, 11:47 a.m. UTC | #1
On 14 July 2015 at 12:45, Maarten Lankhorst
<maarten.lankhorst@linux.intel.com> wrote:
> 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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Reviewed-by: Daniel Stone <daniels@collabora.com>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4934261c8277..a8c8df779eb3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15300,7 +15300,7 @@  static void intel_sanitize_crtc(struct intel_crtc *crtc)
 			      crtc->base.state->enable ? "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.enabled = crtc->active;