]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
drm/i915: correct suspend/resume ordering
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 23 Jun 2009 01:05:12 +0000 (18:05 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 2 Jul 2009 23:51:06 +0000 (16:51 -0700)
commit06ea0c9a0bb0d882a436ecf7876a08ace86de9a8
tree0d20547dbb69401a1d6db26dd5d1f9fcf66d4514
parent2547a3000f19e677ab5eb7e1a9c01164f5bd7922
drm/i915: correct suspend/resume ordering

commit 9e06dd39f2b6d7e35981e0d7aded618686b32ccb upstream.

We need to save register state *after* idling GEM, clearing the ring,
and uninstalling the IRQ handler, or we might end up saving bogus
fence regs, for one.  Our restore ordering should already be correct,
since we do GEM, ring and IRQ init after restoring the last register
state, which prevents us from clobbering things.

I put this together to potentially address a bug, but I haven't heard
back if it fixes it yet.  However I think it stands on its own, so I'm
sending it in.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Cc: Jie Luo <clotho67@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/i915_drv.c