Re: [Intel-gfx] [PATCH 2/2] drm/i915/perf: Store shortcut to intel_uncore

[Lionel Landwerlin]

On 10/10/2019 10:27, Chris Wilson wrote:

Now that we have the engine stored in i915_perf, we have a means of
accessing intel_gt should we require it. However, we are currently only
using the intel_gt to find the right intel_uncore, so replace our
i915_perf.gt pointer with the more useful i915_perf.uncore.

Signed-off-by: Chris Wilson
Cc: Lionel Landwerlin
---


Reviewed-by: Lionel Landwerlin 

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 2/2] drm/i915/perf: Store shortcut to intel_uncore

[Chris Wilson]

Now that we have the engine stored in i915_perf, we have a means of
accessing intel_gt should we require it. However, we are currently only
using the intel_gt to find the right intel_uncore, so replace our
i915_perf.gt pointer with the more useful i915_perf.uncore.

Signed-off-by: Chris Wilson 
Cc: Lionel Landwerlin 
---
 drivers/gpu/drm/i915/i915_perf.c   | 48 +-
 drivers/gpu/drm/i915/i915_perf_types.h |  4 +--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 1a5c6591b9bb..77c3cef64548 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -419,14 +419,14 @@ static int get_oa_config(struct i915_perf *perf,
 
 static u32 gen8_oa_hw_tail_read(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
 
return intel_uncore_read(uncore, GEN8_OATAILPTR) & GEN8_OATAILPTR_MASK;
 }
 
 static u32 gen7_oa_hw_tail_read(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
u32 oastatus1 = intel_uncore_read(uncore, GEN7_OASTATUS1);
 
return oastatus1 & GEN7_OASTATUS1_TAIL_MASK;
@@ -656,7 +656,7 @@ static int gen8_append_oa_reports(struct i915_perf_stream 
*stream,
  size_t count,
  size_t *offset)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
int report_size = stream->oa_buffer.format_size;
u8 *oa_buf_base = stream->oa_buffer.vaddr;
u32 gtt_offset = i915_ggtt_offset(stream->oa_buffer.vma);
@@ -866,7 +866,7 @@ static int gen8_oa_read(struct i915_perf_stream *stream,
size_t count,
size_t *offset)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
u32 oastatus;
int ret;
 
@@ -945,7 +945,7 @@ static int gen7_append_oa_reports(struct i915_perf_stream 
*stream,
  size_t count,
  size_t *offset)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
int report_size = stream->oa_buffer.format_size;
u8 *oa_buf_base = stream->oa_buffer.vaddr;
u32 gtt_offset = i915_ggtt_offset(stream->oa_buffer.vma);
@@ -1077,7 +1077,7 @@ static int gen7_oa_read(struct i915_perf_stream *stream,
size_t count,
size_t *offset)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
u32 oastatus1;
int ret;
 
@@ -1352,8 +1352,8 @@ static void i915_oa_stream_destroy(struct 
i915_perf_stream *stream)
 
free_oa_buffer(stream);
 
-   intel_uncore_forcewake_put(stream->gt->uncore, FORCEWAKE_ALL);
-   intel_runtime_pm_put(stream->gt->uncore->rpm, stream->wakeref);
+   intel_uncore_forcewake_put(stream->uncore, FORCEWAKE_ALL);
+   intel_runtime_pm_put(stream->uncore->rpm, stream->wakeref);
 
if (stream->ctx)
oa_put_render_ctx_id(stream);
@@ -1368,7 +1368,7 @@ static void i915_oa_stream_destroy(struct 
i915_perf_stream *stream)
 
 static void gen7_init_oa_buffer(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
u32 gtt_offset = i915_ggtt_offset(stream->oa_buffer.vma);
unsigned long flags;
 
@@ -1416,7 +1416,7 @@ static void gen7_init_oa_buffer(struct i915_perf_stream 
*stream)
 
 static void gen8_init_oa_buffer(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
u32 gtt_offset = i915_ggtt_offset(stream->oa_buffer.vma);
unsigned long flags;
 
@@ -1565,7 +1565,7 @@ static void delay_after_mux(void)
 
 static int hsw_enable_metric_set(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
const struct i915_oa_config *oa_config = stream->oa_config;
 
/*
@@ -1594,7 +1594,7 @@ static int hsw_enable_metric_set(struct i915_perf_stream 
*stream)
 
 static void hsw_disable_metric_set(struct i915_perf_stream *stream)
 {
-   struct intel_uncore *uncore = stream->gt->uncore;
+   struct intel_uncore *uncore = stream->uncore;
 
intel_uncore_rmw(uncore, GEN6_UCGCTL1,
 GEN6_CSUNIT_CLOCK_GATE_DISABLE, 0);
@@ -1911,7 +1911,7 @@ static int gen8_configure_all_contexts(struct 
i915_perf_stream *stream,
 
 static int gen8_enable_metric_set(struct i915_perf_stream