]> rtime.felk.cvut.cz Git - linux-imx.git/commit
drm/i915: fixup up debugfs rps state handling
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 9 Aug 2012 13:07:01 +0000 (15:07 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 9 Aug 2012 19:49:54 +0000 (21:49 +0200)
commit004777cb22a29e0a95dd1bfce6816a5a06db1e1d
treea7940725a51a1767492ecd49b6b527876f4051df
parent02d719562ef40483648b2cc46899d4a2ff5953bb
drm/i915: fixup up debugfs rps state handling

- Take the dev->struct_mutex around access the corresponding state
  (and adjusting the rps hw state).
- Add an assert to gen6_set_rps to ensure we don't forget about this
  in the future.
- Don't set up the min/max_freq files if it doesn't apply to the hw.
  And do the same for the gen6+ cache sharing file while at it.

v2: Move the gen6+ checks into the read/write callbacks. Thanks to the
awesome drm midlayer we can't check that when registering the debugfs
files, because the driver is not yet fully set up, specifically the
->load callback hasn't run yet.

Oh how I despise this disaster ...

v3: Also add a WARN_ON(mutex_is_locked) in set_rps to check the
locking.

v4: Use mutex_lock_interruptible, suggested by Chris Wilson.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net> (for v2)
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_pm.c