Commit aed3f09d authored by Alban Browaeys's avatar Alban Browaeys Committed by Jesse Barnes

drm/i915: Prevent a machine hang by checking crtc->active before loading lut

Before loading the lut (gamma), check the active state of intel_crtc,
otherwise at least on gen2 hang ensue.

This is reproducible in Xorg via:
  xset dpms force off
then
  xgamma -rgamma 2.0 # freeze.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44505Signed-off-by: default avatarAlban Browaeys <prahal@yahoo.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Cc: stable@kernel.org
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent c0e2ee1b
...@@ -6184,7 +6184,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc) ...@@ -6184,7 +6184,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
int i; int i;
/* The clocks have to be on to load the palette. */ /* The clocks have to be on to load the palette. */
if (!crtc->enabled) if (!crtc->enabled || !intel_crtc->active)
return; return;
/* use legacy palette for Ironlake */ /* use legacy palette for Ironlake */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment