Skip to contentSkip to conversation

drm/i915: Hold RPM wakelock while initializing OA buffer

PATCH In review Sagar Arun Kamble 3 participants 5 messages Jun 27, 2017 – Jul 3, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Hold RPM wakelock while initializing OA buffer

OA buffer initialization involves access to HW registers to set the OA base, head and tail. Ensure device is awake while setting these. With this, all oa.ops are covered under RPM and forcewake wakelock.

---
 drivers/gpu/drm/i915/i915_perf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +6 -6
index 38c4440..9cd22f8 100644
@@ -2067,10 +2067,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
 			return ret;
 	}
 
-	ret = alloc_oa_buffer(dev_priv);
-	if (ret)
-		goto err_oa_buf_alloc;
-
 	/* PRM - observability performance counters:
 	 *
 	 *   OACONTROL, performance counter enable, note:
@@ -2086,6 +2082,10 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
 	intel_runtime_pm_get(dev_priv);
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
+	ret = alloc_oa_buffer(dev_priv);
+	if (ret)
+		goto err_oa_buf_alloc;
+
 	ret = dev_priv->perf.oa.ops.enable_metric_set(dev_priv);
 	if (ret)
 		goto err_enable;
@@ -2097,11 +2097,11 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
 	return 0;
 
 err_enable:
-	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
-	intel_runtime_pm_put(dev_priv);
 	free_oa_buffer(dev_priv);
 
 err_oa_buf_alloc:
+	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+	intel_runtime_pm_put(dev_priv);
 	if (stream->ctx)
 		oa_put_render_ctx_id(stream);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw

Hi Sagar,

Thanks for this patch, it all looks good to me :

Quoted 41 lines · Sagar Arun Kamble

OA buffer initialization involves access to HW registers to set the OA base, head and tail. Ensure device is awake while setting these. With this, all oa.ops are covered under RPM and forcewake wakelock.

---
  drivers/gpu/drm/i915/i915_perf.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +4 -4
index 38c4440..9cd22f8 100644
@@ -2067,10 +2067,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  			return ret;
  	}
 
-	ret = alloc_oa_buffer(dev_priv);
-	if (ret)
-		goto err_oa_buf_alloc;
-
  	/* PRM - observability performance counters:
  	 *
  	 *   OACONTROL, performance counter enable, note:
@@ -2086,6 +2082,10 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  	intel_runtime_pm_get(dev_priv);
  	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
+	ret = alloc_oa_buffer(dev_priv);
+	if (ret)
+		goto err_oa_buf_alloc;
+
  	ret = dev_priv->perf.oa.ops.enable_metric_set(dev_priv);
  	if (ret)
  		goto err_enable;
@@ -2097,11 +2097,11 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  	return 0;
 
  err_enable:

drivers/gpu/drm/i915/i915_perf.c static int i915_oa_stream_init(struct i915_perf_stream *stream, · line 2107

Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +2 -2
-	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
-	intel_runtime_pm_put(dev_priv);
  	free_oa_buffer(dev_priv);
 
  err_oa_buf_alloc:
+	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+	intel_runtime_pm_put(dev_priv);
  	if (stream->ctx)
  		oa_put_render_ctx_id(stream);
 

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Sagar Arun Kamble
Fixes d79651522e89c ("drm/i915: Enable i915 perf stream for Haswell OA unit")
Quoted 41 lines · Sagar Arun Kamble

OA buffer initialization involves access to HW registers to set the OA base, head and tail. Ensure device is awake while setting these. With this, all oa.ops are covered under RPM and forcewake wakelock.

---
  drivers/gpu/drm/i915/i915_perf.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +4 -4
index 38c4440..9cd22f8 100644
@@ -2067,10 +2067,6 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  			return ret;
  	}
 
-	ret = alloc_oa_buffer(dev_priv);
-	if (ret)
-		goto err_oa_buf_alloc;
-
  	/* PRM - observability performance counters:
  	 *
  	 *   OACONTROL, performance counter enable, note:
@@ -2086,6 +2082,10 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  	intel_runtime_pm_get(dev_priv);
  	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
+	ret = alloc_oa_buffer(dev_priv);
+	if (ret)
+		goto err_oa_buf_alloc;
+
  	ret = dev_priv->perf.oa.ops.enable_metric_set(dev_priv);
  	if (ret)
  		goto err_enable;
@@ -2097,11 +2097,11 @@ static int i915_oa_stream_init(struct i915_perf_stream *stream,
  	return 0;
 
  err_enable:

drivers/gpu/drm/i915/i915_perf.c static int i915_oa_stream_init(struct i915_perf_stream *stream, · line 2107

Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +2 -2
-	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
-	intel_runtime_pm_put(dev_priv);
  	free_oa_buffer(dev_priv);
 
  err_oa_buf_alloc:
+	intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+	intel_runtime_pm_put(dev_priv);
  	if (stream->ctx)
  		oa_put_render_ctx_id(stream);
 

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Hi Daniel,

Any chance on getting this patch upstream?

Thanks a lot!

-
Lionel

Quoted 51 lines · Lionel Landwerlin
Fixes d79651522e89c ("drm/i915: Enable i915 perf stream for Haswell OA unit")
Quoted 47 lines · Sagar Arun Kamble

OA buffer initialization involves access to HW registers to set the OA base, head and tail. Ensure device is awake while setting these. With this, all oa.ops are covered under RPM and forcewake wakelock.

---
  drivers/gpu/drm/i915/i915_perf.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +5 -5
index 38c4440..9cd22f8 100644
@@ -2067,10 +2067,6 @@ static int i915_oa_stream_init(struct 
 i915_perf_stream *stream,
              return ret;
      }
  -    ret = alloc_oa_buffer(dev_priv);
-    if (ret)
-        goto err_oa_buf_alloc;
-
      /* PRM - observability performance counters:
       *
       *   OACONTROL, performance counter enable, note:
@@ -2086,6 +2082,10 @@ static int i915_oa_stream_init(struct 
 i915_perf_stream *stream,
      intel_runtime_pm_get(dev_priv);
      intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
  +    ret = alloc_oa_buffer(dev_priv);
+    if (ret)
+        goto err_oa_buf_alloc;
+
      ret = dev_priv->perf.oa.ops.enable_metric_set(dev_priv);
      if (ret)
          goto err_enable;
@@ -2097,11 +2097,11 @@ static int i915_oa_stream_init(struct 
 i915_perf_stream *stream,
      return 0;
    err_enable:
-    intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
-    intel_runtime_pm_put(dev_priv);
      free_oa_buffer(dev_priv);
    err_oa_buf_alloc:
+    intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
+    intel_runtime_pm_put(dev_priv);
Quoted 8 lines

drivers/gpu/drm/i915/i915_perf.c static int i915_oa_stream_init(struct i915_perf_stream *stream, · line 2106

Quoted 2 lines
drivers/gpu/drm/i915/i915_perf.c +0 -0
      if (stream->ctx)
          oa_put_render_ctx_id(stream);

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx