aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_overlay.c
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2015-05-29 12:43:49 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 08:02:15 -0400
commit75289874e4484cd4702b3341b654b45b4a09b9d3 (patch)
tree08e557f1122a41b8051099a69e65773411f10978 /drivers/gpu/drm/i915/intel_overlay.c
parent6258fbe23fe04da544261f48112a292bdb068c12 (diff)
drm/i915: Update add_request() to take a request structure
Now that all callers of i915_add_request() have a request pointer to hand, it is possible to update the add request function to take a request pointer rather than pulling it out of the OLR. 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_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 3adb63eb0b99..3f709042b86c 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -217,7 +217,7 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay,
217 217
218 WARN_ON(overlay->last_flip_req); 218 WARN_ON(overlay->last_flip_req);
219 i915_gem_request_assign(&overlay->last_flip_req, req); 219 i915_gem_request_assign(&overlay->last_flip_req, req);
220 i915_add_request(req->ring); 220 i915_add_request(req);
221 221
222 overlay->flip_tail = tail; 222 overlay->flip_tail = tail;
223 ret = i915_wait_request(overlay->last_flip_req); 223 ret = i915_wait_request(overlay->last_flip_req);
@@ -299,7 +299,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay,
299 299
300 WARN_ON(overlay->last_flip_req); 300 WARN_ON(overlay->last_flip_req);
301 i915_gem_request_assign(&overlay->last_flip_req, req); 301 i915_gem_request_assign(&overlay->last_flip_req, req);
302 i915_add_request(req->ring); 302 i915_add_request(req);
303 303
304 return 0; 304 return 0;
305} 305}