From: "sagar.a.kamble@intel.com" <sagar.a.kamble@intel.com>

Date: Tue, 27 Jun 2017 23:09:41 +0530

Subject: [PATCH] drm/i915: Hold RPM wakelock while initializing OA buffer

References: bnc#1060662

Patch-mainline: v4.12.4

Git-commit: 04941829b0049d2446c7042ab9686dd057d809a6

Git-commit: 987f8c444aa2c33d98e7030d0c5f0a5325cc84ea

commit 04941829b0049d2446c7042ab9686dd057d809a6 upstream.

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.

Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Link: http://patchwork.freedesktop.org/patch/msgid/1498585181-23048-1-git-send-email-sagar.a.kamble@intel.com

Fixes: d79651522e89c ("drm/i915: Enable i915 perf stream for Haswell OA unit")

(cherry picked from commit 987f8c444aa2c33d98e7030d0c5f0a5325cc84ea)

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/gpu/drm/i915/i915_perf.c | 12 ++++++------

 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c

index 060b171480d5..aac84dda532c 100644

--- a/drivers/gpu/drm/i915/i915_perf.c

+++ b/drivers/gpu/drm/i915/i915_perf.c

@@ -1210,10 +1210,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:

@@ -1229,6 +1225,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;

@@ -1240,11 +1240,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);

-- 

2.14.2