diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-03-02 08:57:57 +0000 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2020-03-04 13:49:26 +0200 |
| commit | 08f56f8f3799b2ed1c5ac7eed6d86a4926289655 (patch) | |
| tree | a77da9684d40ce85d16819d1d234363b24ba1eff /drivers/gpu/drm/i915/i915_perf_types.h | |
| parent | drm/i915/selftests: Fix return in assert_mmap_offset() (diff) | |
| download | linux-dev-08f56f8f3799b2ed1c5ac7eed6d86a4926289655.tar.xz linux-dev-08f56f8f3799b2ed1c5ac7eed6d86a4926289655.zip | |
drm/i915/perf: Reintroduce wait on OA configuration completion
We still need to wait for the initial OA configuration to happen
before we enable OA report writes to the OA buffer.
Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 15d0ace1f876 ("drm/i915/perf: execute OA configuration from command stream")
Closes: https://gitlab.freedesktop.org/drm/intel/issues/1356
Testcase: igt/perf/stream-open-close
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200302085812.4172450-7-chris@chris-wilson.co.uk
(cherry picked from commit 4b4e973d5eb89244b67d3223b60f752d0479f253)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_perf_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf_types.h b/drivers/gpu/drm/i915/i915_perf_types.h index 45e581455f5d..a0e22f00f6cf 100644 --- a/drivers/gpu/drm/i915/i915_perf_types.h +++ b/drivers/gpu/drm/i915/i915_perf_types.h @@ -339,7 +339,8 @@ struct i915_oa_ops { * counter reports being sampled. May apply system constraints such as * disabling EU clock gating as required. */ - int (*enable_metric_set)(struct i915_perf_stream *stream); + struct i915_request * + (*enable_metric_set)(struct i915_perf_stream *stream); /** * @disable_metric_set: Remove system constraints associated with using |