drm/i915/perf: remove perf.hook_lock

In earlier iterations of the i915-perf driver we had a number of
callbacks/hooks from other parts of the i915 driver to e.g. notify us
when a legacy context was pinned and these could run asynchronously with
respect to the stream file operations and might also run in atomic
context.

dev_priv->perf.hook_lock had been for serialising access to state needed
within these callbacks, but as the code has evolved some of the hooks
have gone away or are implemented to avoid needing to lock any state.

The remaining use of this lock was actually redundant considering how
the gen7 oacontrol state used to be updated as part of a context pin
hook.

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 975e216f346987a5057e4b8ce3b5e58a71266ddf..8d33b810f8b41ca5e47834c91affed6ebe007322 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2396,8 +2396,6 @@ struct drm_i915_private {
                struct mutex lock;
                struct list_head streams;
 
-               spinlock_t hook_lock;
-
                struct {
                        struct i915_perf_stream *exclusive_stream;
 

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 4d79698685ea40d62eb349867c2458d2ac9383a0..1980f9597b19e59529a1a50c5522059bdc7edab3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -1836,9 +1836,18 @@ static void gen8_disable_metric_set(struct drm_i915_private *dev_priv)
        gen8_configure_all_contexts(dev_priv, false);
 }
 
-static void gen7_update_oacontrol_locked(struct drm_i915_private *dev_priv)
+static void gen7_oa_enable(struct drm_i915_private *dev_priv)
 {
-       lockdep_assert_held(&dev_priv->perf.hook_lock);
+       /*
+        * Reset buf pointers so we don't forward reports from before now.
+        *
+        * Think carefully if considering trying to avoid this, since it
+        * also ensures status flags and the buffer itself are cleared
+        * in error paths, and we have checks for invalid reports based
+        * on the assumption that certain fields are written to zeroed
+        * memory which this helps maintains.
+        */
+       gen7_init_oa_buffer(dev_priv);
 
        if (dev_priv->perf.oa.exclusive_stream->enabled) {
                struct i915_gem_context *ctx =
@@ -1861,25 +1870,6 @@ static void gen7_update_oacontrol_locked(struct drm_i915_private *dev_priv)
                I915_WRITE(GEN7_OACONTROL, 0);
 }
 
-static void gen7_oa_enable(struct drm_i915_private *dev_priv)
-{
-       unsigned long flags;
-
-       /* Reset buf pointers so we don't forward reports from before now.
-        *
-        * Think carefully if considering trying to avoid this, since it
-        * also ensures status flags and the buffer itself are cleared
-        * in error paths, and we have checks for invalid reports based
-        * on the assumption that certain fields are written to zeroed
-        * memory which this helps maintains.
-        */
-       gen7_init_oa_buffer(dev_priv);
-
-       spin_lock_irqsave(&dev_priv->perf.hook_lock, flags);
-       gen7_update_oacontrol_locked(dev_priv);
-       spin_unlock_irqrestore(&dev_priv->perf.hook_lock, flags);
-}
-
 static void gen8_oa_enable(struct drm_i915_private *dev_priv)
 {
        u32 report_format = dev_priv->perf.oa.oa_buffer.format;
@@ -3098,7 +3088,6 @@ void i915_perf_init(struct drm_i915_private *dev_priv)
 
                INIT_LIST_HEAD(&dev_priv->perf.streams);
                mutex_init(&dev_priv->perf.lock);
-               spin_lock_init(&dev_priv->perf.hook_lock);
                spin_lock_init(&dev_priv->perf.oa.oa_buffer.ptr_lock);
 
                oa_sample_rate_hard_limit =