aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_overlay.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
-rw-r--r--drivers/gpu/drm/i915/intel_overlay.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 3fbb98b948d6..d2fdfd589c85 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -221,16 +221,15 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
221 int ret; 221 int ret;
222 222
223 BUG_ON(overlay->last_flip_req); 223 BUG_ON(overlay->last_flip_req);
224 ret = i915_add_request(dev, NULL, request, LP_RING(dev_priv)); 224 ret = i915_add_request(LP_RING(dev_priv), NULL, request);
225 if (ret) { 225 if (ret) {
226 kfree(request); 226 kfree(request);
227 return ret; 227 return ret;
228 } 228 }
229 overlay->last_flip_req = request->seqno; 229 overlay->last_flip_req = request->seqno;
230 overlay->flip_tail = tail; 230 overlay->flip_tail = tail;
231 ret = i915_do_wait_request(dev, 231 ret = i915_wait_request(LP_RING(dev_priv),
232 overlay->last_flip_req, true, 232 overlay->last_flip_req, true);
233 LP_RING(dev_priv));
234 if (ret) 233 if (ret)
235 return ret; 234 return ret;
236 235
@@ -364,7 +363,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay,
364 OUT_RING(flip_addr); 363 OUT_RING(flip_addr);
365 ADVANCE_LP_RING(); 364 ADVANCE_LP_RING();
366 365
367 ret = i915_add_request(dev, NULL, request, LP_RING(dev_priv)); 366 ret = i915_add_request(LP_RING(dev_priv), NULL, request);
368 if (ret) { 367 if (ret) {
369 kfree(request); 368 kfree(request);
370 return ret; 369 return ret;
@@ -453,8 +452,8 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
453 if (overlay->last_flip_req == 0) 452 if (overlay->last_flip_req == 0)
454 return 0; 453 return 0;
455 454
456 ret = i915_do_wait_request(dev, overlay->last_flip_req, 455 ret = i915_wait_request(LP_RING(dev_priv),
457 interruptible, LP_RING(dev_priv)); 456 overlay->last_flip_req, interruptible);
458 if (ret) 457 if (ret)
459 return ret; 458 return ret;
460 459