diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-03 07:53:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-09-03 13:11:05 +0100 |
| commit | 4bb05040fd685c549e6550f09daffee6cde4c370 (patch) | |
| tree | 4eaef5614fe0e9763a3020c4225d3d9b11119ea0 | |
| parent | 02c53d99b6eb44c7a78e648d023d0485b71f661e (diff) | |
| download | linux-4bb05040fd685c549e6550f09daffee6cde4c370.tar.gz linux-4bb05040fd685c549e6550f09daffee6cde4c370.tar.bz2 linux-4bb05040fd685c549e6550f09daffee6cde4c370.zip | |
drm/i915: debugfs/i915_gem_interrupt_info does not need struct_mutex
i915_gem_interrupt_info() only looks at mmio registers, and the waiters
under a spinlock. It doesn't need struct_mutex (but does need the rpm
wakelock for mmio access). Maybe useful using get_if_notidle?
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20160903065343.25151-2-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 3590f1fe988e..b8e40fde132a 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -726,13 +726,9 @@ static int i915_gem_seqno_info(struct seq_file *m, void *data) static int i915_interrupt_info(struct seq_file *m, void *data) { struct drm_i915_private *dev_priv = node_to_i915(m->private); - struct drm_device *dev = &dev_priv->drm; struct intel_engine_cs *engine; - int ret, i, pipe; + int i, pipe; - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; intel_runtime_pm_get(dev_priv); if (IS_CHERRYVIEW(dev_priv)) { @@ -908,7 +904,6 @@ static int i915_interrupt_info(struct seq_file *m, void *data) i915_ring_seqno_info(m, engine); } intel_runtime_pm_put(dev_priv); - mutex_unlock(&dev->struct_mutex); return 0; } |