aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_overlay.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-01-25 18:39:34 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-26 05:19:19 -0500
commitb93f9cf14e714c20ce9a544ed1a6070ee7604588 (patch)
treebbf78a595254e96d88206bb60f400ae907a561f0 /drivers/gpu/drm/i915/intel_overlay.c
parentfc74d8e01165b567922921d110b6d16320a61fa6 (diff)
drm/i915: argument to control retiring behavior
Sometimes it may be the case when we idle the gpu or wait on something we don't actually want to process the retiring list. This patch allows callers to choose the behavior. Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
-rw-r--r--drivers/gpu/drm/i915/intel_overlay.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index cdf17d4cc1f7..23a543cdfa99 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -227,7 +227,8 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
227 } 227 }
228 overlay->last_flip_req = request->seqno; 228 overlay->last_flip_req = request->seqno;
229 overlay->flip_tail = tail; 229 overlay->flip_tail = tail;
230 ret = i915_wait_request(LP_RING(dev_priv), overlay->last_flip_req); 230 ret = i915_wait_request(LP_RING(dev_priv), overlay->last_flip_req,
231 true);
231 if (ret) 232 if (ret)
232 return ret; 233 return ret;
233 234
@@ -448,7 +449,8 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
448 if (overlay->last_flip_req == 0) 449 if (overlay->last_flip_req == 0)
449 return 0; 450 return 0;
450 451
451 ret = i915_wait_request(LP_RING(dev_priv), overlay->last_flip_req); 452 ret = i915_wait_request(LP_RING(dev_priv), overlay->last_flip_req,
453 true);
452 if (ret) 454 if (ret)
453 return ret; 455 return ret;
454 456