drm/i915: Prevent a machine hang by checking crtc->active before loading lut
authorAlban Browaeys <prahal@yahoo.com>
Fri, 24 Feb 2012 17:12:45 +0000 (17:12 +0000)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 24 Feb 2012 17:36:25 +0000 (09:36 -0800)
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>
Cc: stable@kernel.org
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/gpu/drm/i915/intel_display.c

Simple merge