aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>2018-12-03 08:33:57 -0500
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>2018-12-04 07:23:22 -0500
commit452420d22d5b41256a0bb82402a797295e525da9 (patch)
tree8ce920f70091f1db5d887aa0b5e447c04d5962bb /drivers/gpu/drm/i915/intel_ringbuffer.c
parent69bcdecf1af5600dabbab890e3d8d9714638f91d (diff)
drm/i915: Fuse per-context workaround handling with the common framework
Convert the per context workaround handling code to run against the newly introduced common workaround framework and fuse the two to use the existing smarter list add helper, the one which does the sorted insert and merges registers where possible. This completes migration of all four classes of workarounds onto the common framework. Existing macros are kept untouched for smaller code churn. v2: * Rename to list name ctx_wa_list and move from dev_priv to engine. v3: * API rename and parameters tweaking. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20181203133357.10341-1-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 81b10d85b738..7f88df5bff09 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -656,7 +656,7 @@ static int intel_rcs_ctx_init(struct i915_request *rq)
656{ 656{
657 int ret; 657 int ret;
658 658
659 ret = intel_ctx_workarounds_emit(rq); 659 ret = intel_engine_emit_ctx_wa(rq);
660 if (ret != 0) 660 if (ret != 0)
661 return ret; 661 return ret;
662 662