[PATCH 2/3] drm/i915: Don't enable the cursor on a disable pipe

ville.syrjala
2013-09-12T19:45:42Z

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

On HSW enabling a plane on a disabled pipe may hang the entire system.
And there's no good reason for doing it ever, so just don't.

Cc: stable@vger.kernel.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 18043a2..d0137b6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6793,6 +6793,9 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
u32 base, pos;
bool visible;

+ if (!intel_crtc->active)
+ return;
+
pos = 0;

if (on && crtc->enabled && crtc->fb) {
--
1.8.1.5