Commit 28b6cb08 authored by Chris Wilson's avatar Chris Wilson

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: default avatarChris 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.ukReviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent 84a095e4
...@@ -2170,15 +2170,12 @@ void i915_oa_init_reg_state(struct intel_engine_cs *engine, ...@@ -2170,15 +2170,12 @@ void i915_oa_init_reg_state(struct intel_engine_cs *engine,
struct i915_gem_context *ctx, struct i915_gem_context *ctx,
u32 *reg_state) u32 *reg_state)
{ {
struct drm_i915_private *dev_priv = engine->i915; struct i915_perf_stream *stream;
struct i915_perf_stream *stream = dev_priv->perf.oa.exclusive_stream;
if (engine->id != RCS) if (engine->id != RCS)
return; return;
if (!dev_priv->perf.initialized) stream = engine->i915->perf.oa.exclusive_stream;
return;
if (stream) if (stream)
gen8_update_reg_state_unlocked(ctx, reg_state, stream->oa_config); gen8_update_reg_state_unlocked(ctx, reg_state, stream->oa_config);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment