diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-08-10 18:57:43 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-08-10 21:43:11 +0100 |
| commit | 28b6cb08206fe19585f57c3f5c683aff9b2e2fdf (patch) | |
| tree | 2cb510a029d0f1aa97443ea1e39e6fe5d28f49ad /drivers/gpu | |
| parent | 84a095e41398efdb245e99cb811bcc0bc24fa504 (diff) | |
| download | linux-stable-28b6cb08206fe19585f57c3f5c683aff9b2e2fdf.tar.gz linux-stable-28b6cb08206fe19585f57c3f5c683aff9b2e2fdf.tar.bz2 linux-stable-28b6cb08206fe19585f57c3f5c683aff9b2e2fdf.zip | |
drm/i915/perf: Drop redundant check for perf.initialised on reset
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 <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170810175743.25401-3-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf.c | 7 |
1 files 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); } |