Re: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Drop redundant check for perf.initialised on reset

2017-08-10 Thread Chris Wilson
Quoting Matthew Auld (2017-08-10 20:02:22)
> On 10 August 2017 at 18:57, Chris Wilson  wrote:
> > As we cannot have an exclusive stream set if the perf has not been
> > initialized, we only need to check for that exclusive stream.
> >
> > Signed-off-by: Chris Wilson 
> > Cc: Lionel Landwerlin 
> > Cc: Matthew Auld 
> Reviewed-by: Matthew Auld 

Hmm, pw why have you foresaken me?  Oh well, trybot was happy
https://patchwork.freedesktop.org/series/28639/

Pushed so that CI is functional again, hopefully that wasn't a mistake.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


Re: [Intel-gfx] [PATCH 3/3] drm/i915/perf: Drop redundant check for perf.initialised on reset

2017-08-10 Thread Matthew Auld
On 10 August 2017 at 18:57, Chris Wilson  wrote:
> As we cannot have an exclusive stream set if the perf has not been
> initialized, we only need to check for that exclusive stream.
>
> Signed-off-by: Chris Wilson 
> Cc: Lionel Landwerlin 
> Cc: Matthew Auld 
Reviewed-by: Matthew Auld 
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 3/3] drm/i915/perf: Drop redundant check for perf.initialised on reset

2017-08-10 Thread Chris Wilson
As we cannot have an exclusive stream set if the perf has not been
initialized, we only need to check for that exclusive stream.

Signed-off-by: Chris Wilson 
Cc: Lionel Landwerlin 
Cc: Matthew Auld 
---
 drivers/gpu/drm/i915/i915_perf.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 3bdf53faae24..94185d610673 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -2170,15 +2170,12 @@ void i915_oa_init_reg_state(struct intel_engine_cs 
*engine,
struct i915_gem_context *ctx,
u32 *reg_state)
 {
-   struct drm_i915_private *dev_priv = engine->i915;
-   struct i915_perf_stream *stream = dev_priv->perf.oa.exclusive_stream;
+   struct i915_perf_stream *stream;
 
if (engine->id != RCS)
return;
 
-   if (!dev_priv->perf.initialized)
-   return;
-
+   stream = engine->i915->perf.oa.exclusive_stream;
if (stream)
gen8_update_reg_state_unlocked(ctx, reg_state, 
stream->oa_config);
 }
-- 
2.13.3

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