diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-02-11 16:29:04 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:36 -0400 |
commit | 8a1a49f954734040dbc7b87e3b1221a050045e43 (patch) | |
tree | 4bd64e76791b1e56e5ffc69f065e3831fe0b9979 /drivers/gpu/drm/i915/intel_overlay.c | |
parent | a6910434e1b5f2a9fe7cab39b01bae9a7a7bbe70 (diff) |
drm/i915: move flushing list processing to i915_retire_commands
... instead of threading flush_domains through the execbuf code to
i915_add_request.
With this change 2 small cleanups are possible (likewise the majority
of the patch):
- The flush_domains parameter of i915_add_request is always 0. Drop it
and the corresponding logic.
- Ditto for the seqno param of i915_gem_process_flushing_list.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 1d306a458be6..a203b5c7ff71 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -230,7 +230,7 @@ static int intel_overlay_on(struct intel_overlay *overlay) | |||
230 | ADVANCE_LP_RING(); | 230 | ADVANCE_LP_RING(); |
231 | 231 | ||
232 | overlay->last_flip_req = | 232 | overlay->last_flip_req = |
233 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 233 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
234 | if (overlay->last_flip_req == 0) | 234 | if (overlay->last_flip_req == 0) |
235 | return -ENOMEM; | 235 | return -ENOMEM; |
236 | 236 | ||
@@ -269,7 +269,7 @@ static void intel_overlay_continue(struct intel_overlay *overlay, | |||
269 | ADVANCE_LP_RING(); | 269 | ADVANCE_LP_RING(); |
270 | 270 | ||
271 | overlay->last_flip_req = | 271 | overlay->last_flip_req = |
272 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 272 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
273 | } | 273 | } |
274 | 274 | ||
275 | static int intel_overlay_wait_flip(struct intel_overlay *overlay) | 275 | static int intel_overlay_wait_flip(struct intel_overlay *overlay) |
@@ -301,7 +301,7 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay) | |||
301 | ADVANCE_LP_RING(); | 301 | ADVANCE_LP_RING(); |
302 | 302 | ||
303 | overlay->last_flip_req = | 303 | overlay->last_flip_req = |
304 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 304 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
305 | if (overlay->last_flip_req == 0) | 305 | if (overlay->last_flip_req == 0) |
306 | return -ENOMEM; | 306 | return -ENOMEM; |
307 | 307 | ||
@@ -342,7 +342,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) | |||
342 | ADVANCE_LP_RING(); | 342 | ADVANCE_LP_RING(); |
343 | 343 | ||
344 | overlay->last_flip_req = | 344 | overlay->last_flip_req = |
345 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 345 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
346 | if (overlay->last_flip_req == 0) | 346 | if (overlay->last_flip_req == 0) |
347 | return -ENOMEM; | 347 | return -ENOMEM; |
348 | 348 | ||
@@ -362,7 +362,7 @@ static int intel_overlay_off(struct intel_overlay *overlay) | |||
362 | ADVANCE_LP_RING(); | 362 | ADVANCE_LP_RING(); |
363 | 363 | ||
364 | overlay->last_flip_req = | 364 | overlay->last_flip_req = |
365 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 365 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
366 | if (overlay->last_flip_req == 0) | 366 | if (overlay->last_flip_req == 0) |
367 | return -ENOMEM; | 367 | return -ENOMEM; |
368 | 368 | ||
@@ -409,7 +409,7 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | |||
409 | 409 | ||
410 | if (overlay->last_flip_req == 0) { | 410 | if (overlay->last_flip_req == 0) { |
411 | overlay->last_flip_req = | 411 | overlay->last_flip_req = |
412 | i915_add_request(dev, NULL, 0, &dev_priv->render_ring); | 412 | i915_add_request(dev, NULL, &dev_priv->render_ring); |
413 | if (overlay->last_flip_req == 0) | 413 | if (overlay->last_flip_req == 0) |
414 | return -ENOMEM; | 414 | return -ENOMEM; |
415 | } | 415 | } |
@@ -439,8 +439,9 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | |||
439 | OUT_RING(MI_NOOP); | 439 | OUT_RING(MI_NOOP); |
440 | ADVANCE_LP_RING(); | 440 | ADVANCE_LP_RING(); |
441 | 441 | ||
442 | overlay->last_flip_req = i915_add_request(dev, NULL, | 442 | overlay->last_flip_req = |
443 | 0, &dev_priv->render_ring); | 443 | i915_add_request(dev, NULL, |
444 | &dev_priv->render_ring); | ||
444 | if (overlay->last_flip_req == 0) | 445 | if (overlay->last_flip_req == 0) |
445 | return -ENOMEM; | 446 | return -ENOMEM; |
446 | 447 | ||