aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2015-05-29 12:43:54 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 08:02:19 -0400
commite2be4faf30d6cb0af77c0105837df25f925903c9 (patch)
treec0dfb3eab25f4d39b1a174b1621f3459ef6a554c /drivers/gpu/drm/i915/intel_ringbuffer.c
parent2f20055d360a2bb6863163d8b8b005ded1f6ba08 (diff)
drm/i915: Update workarounds_emit() to take request structures
Updated the *_ring_workarounds_emit() functions to take requests instead of ring/context pairs. For: VIZ-5115 Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Tomas Elf <tomas.elf@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 6bdb0ac1edf3..49869feb9e23 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -703,10 +703,10 @@ err:
703 return ret; 703 return ret;
704} 704}
705 705
706static int intel_ring_workarounds_emit(struct intel_engine_cs *ring, 706static int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
707 struct intel_context *ctx)
708{ 707{
709 int ret, i; 708 int ret, i;
709 struct intel_engine_cs *ring = req->ring;
710 struct drm_device *dev = ring->dev; 710 struct drm_device *dev = ring->dev;
711 struct drm_i915_private *dev_priv = dev->dev_private; 711 struct drm_i915_private *dev_priv = dev->dev_private;
712 struct i915_workarounds *w = &dev_priv->workarounds; 712 struct i915_workarounds *w = &dev_priv->workarounds;
@@ -746,7 +746,7 @@ static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)
746{ 746{
747 int ret; 747 int ret;
748 748
749 ret = intel_ring_workarounds_emit(req->ring, req->ctx); 749 ret = intel_ring_workarounds_emit(req);
750 if (ret != 0) 750 if (ret != 0)
751 return ret; 751 return ret;
752 752