drm/i915: Fix RC6 suspend/resume
authorAndrew Lutomirski <luto@mit.edu>
Mon, 21 Dec 2009 15:10:22 +0000 (10:10 -0500)
committerEric Anholt <eric@anholt.net>
Wed, 6 Jan 2010 17:39:53 +0000 (09:39 -0800)
commit1d3c36ad4122651018599d4e3c9be0cccfbfb939
treec7505143a7b2a1459d8a87c680461692927aec0f
parent76446cac68568fc7f5168a27deaf803ed22a4360
drm/i915: Fix RC6 suspend/resume

We restored RC6 twice on resume, even with modesetting off.  Instead,
only restore it once and skip RC6 initialization entirely in non-KMS mode.

Signed-off-by: Andy Lutomirski <luto@mit.edu>
Tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_display.c