summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_perf.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2020-04-06 16:58:38 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2020-04-06 19:48:05 +0100
commit442dbc5c686153f2c86eeca21d0df010dc8f1c3a (patch)
tree38bb8b6504c2ca3ac8bb11ed7982a0c23c2eaecb /drivers/gpu/drm/i915/i915_perf.c
parent39d571d172312c7f76570ba86c4074f170aaf442 (diff)
downloadlinux-442dbc5c686153f2c86eeca21d0df010dc8f1c3a.tar.bz2
drm/i915: Make exclusive awaits on i915_active optional
Later use will require asynchronous waits on the active timelines, but will not utilize an async wait on the exclusive channel. Make the await on the exclusive fence explicit in the selection flags. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200406155840.1728-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_perf.c')
-rw-r--r--drivers/gpu/drm/i915/i915_perf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 2f78b147bb2d..5cde3e4e7be6 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -1948,7 +1948,7 @@ emit_oa_config(struct i915_perf_stream *stream,
if (!IS_ERR_OR_NULL(active)) {
/* After all individual context modifications */
err = i915_request_await_active(rq, active,
- I915_ACTIVE_AWAIT_ALL);
+ I915_ACTIVE_AWAIT_ACTIVE);
if (err)
goto err_add_request;