projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84a095e
)
drm/i915/perf: Drop redundant check for perf.initialised on reset
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 10 Aug 2017 17:57:43 +0000
(18:57 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 10 Aug 2017 20:43:11 +0000
(21:43 +0100)
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>
drivers/gpu/drm/i915/i915_perf.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_perf.c
b/drivers/gpu/drm/i915/i915_perf.c
index
3bdf53f
..
94185d6
100644
(file)
--- 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);
}