]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: fix rc6 enabling around suspend/resume
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 5 Jan 2011 20:01:25 +0000 (12:01 -0800)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 11 Jan 2011 20:43:59 +0000 (20:43 +0000)
commit1daed3fb8324d517a1f9da43f1a1d3619d1b0ddc
tree26a619fb505bdd8bea7b9b175eb062557061b041
parent88271da3f3da75d6eaef5e768c82a1627edf7088
drm/i915: fix rc6 enabling around suspend/resume

Enabling RC6 implies setting a graphics context.  Make sure we do that
only after the ring has been enabled, otherwise our ring commands will
hang.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_suspend.c