drm/i915: fix ilk rc6 teardown locking
authorBen Widawsky <ben@bwidawsk.net>
Sun, 20 Mar 2011 01:14:26 +0000 (18:14 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 10 May 2011 20:56:40 +0000 (13:56 -0700)
commit2c34b850ee1e9f86b41706149d0954eee58757a3
treee2c62976d4efd5b88f5914fdb91ff5f110328823
parent273e27ca8081095a1bdf65276d4b645215ad1c57
drm/i915: fix ilk rc6 teardown locking

In the failure cases during rc6 initialization, both the power context
and render context may get !refcount without holding struct_mutex.
However, on rc6 disabling, the lock is held by the caller.

Rearranged the locking so that it's safe in both cases.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
drivers/gpu/drm/i915/intel_display.c