aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_overlay.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-05-24 18:03:11 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-25 08:18:42 -0400
commit199b2bc25ba587f666a712e9d8475d691d9cec4c (patch)
tree881ec361edb3bc81382aff6d66a1ba39ffa5a71a /drivers/gpu/drm/i915/intel_overlay.c
parent23ba4fd0a42a46551041e379712e808ad496ba45 (diff)
drm/i915: s/i915_wait_request/i915_wait_seqno/g
Wait request is poorly named IMO. After working with these functions for some time, I feel it's much clearer to name the functions more appropriately. Of course we must update the callers to use the new name as well. This leaves room within our namespace for a *real* wait request function at some point. Note to maintainer: this patch is optional. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 458743da3774..830d0dd610e1 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -226,7 +226,7 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
226 } 226 }
227 overlay->last_flip_req = request->seqno; 227 overlay->last_flip_req = request->seqno;
228 overlay->flip_tail = tail; 228 overlay->flip_tail = tail;
229 ret = i915_wait_request(ring, overlay->last_flip_req); 229 ret = i915_wait_seqno(ring, overlay->last_flip_req);
230 if (ret) 230 if (ret)
231 return ret; 231 return ret;
232 i915_gem_retire_requests(dev); 232 i915_gem_retire_requests(dev);
@@ -452,7 +452,7 @@ static int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay)
452 if (overlay->last_flip_req == 0) 452 if (overlay->last_flip_req == 0)
453 return 0; 453 return 0;
454 454
455 ret = i915_wait_request(ring, overlay->last_flip_req); 455 ret = i915_wait_seqno(ring, overlay->last_flip_req);
456 if (ret) 456 if (ret)
457 return ret; 457 return ret;
458 i915_gem_retire_requests(dev); 458 i915_gem_retire_requests(dev);