drm/i915: Clean up multi-threaded forcewake patch
authorKeith Packard <keithp@keithp.com>
Fri, 9 Dec 2011 19:33:00 +0000 (11:33 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 3 Jan 2012 17:09:45 +0000 (09:09 -0800)
commitc7dffff7cc8de748edf0e9f6571cdabecb198705
treee897b2a9c0f5313ad1b8bc494e4b19abca6c5314
parent4d85529d584856d077895a2daa703224d3aee7e1
drm/i915: Clean up multi-threaded forcewake patch

We learned that the ECOBUS register was inside the GT power well, and
so *did* need force wake to be read, so it gets removed from the list
of 'doesn't need force wake' registers.

That means the code reading ECOBUS after forcing the mt_force_wake
function to be called needs to use I915_READ_NOTRACE; it doesn't need
to do more force wake fun as it's already done it manually.

This also adds a comment explaining why the MT forcewake testing code
only needs to call mt_forcewake_get/put and not disable RC6 manually
-- the ECOBUS read will return 0 if the device is in RC6 and isn't
using MT forcewake, causing the test to work correctly.

Signed-off-by: Keith Packard <keithp@keithp.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c