diff options
| author | Alban Browaeys <prahal@yahoo.com> | 2012-02-24 12:12:45 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 13:32:39 -0400 |
| commit | 46ef1956475fd62f21ee67b3f49dbfe2a60fa13d (patch) | |
| tree | 29deaf0113cc7ab774cb6b9e25650cf076de7b86 /drivers/gpu/drm | |
| parent | 9eb9e47632735bb3bb3da343663ea10a6954ef31 (diff) | |
drm/i915: Prevent a machine hang by checking crtc->active before loading lut
commit aed3f09db39596e539f90b11a5016aea4d8442e1 upstream.
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=44505
Signed-off-by: Alban Browaeys <prahal@yahoo.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fed87d6a5b9..e4b25861a12 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -5265,7 +5265,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc) | |||
| 5265 | int i; | 5265 | int i; |
| 5266 | 5266 | ||
| 5267 | /* The clocks have to be on to load the palette. */ | 5267 | /* The clocks have to be on to load the palette. */ |
| 5268 | if (!crtc->enabled) | 5268 | if (!crtc->enabled || !intel_crtc->active) |
| 5269 | return; | 5269 | return; |
| 5270 | 5270 | ||
| 5271 | /* use legacy palette for Ironlake */ | 5271 | /* use legacy palette for Ironlake */ |