diff options
| author | Chris Wilson | 2010-10-27 17:11:02 +0200 |
|---|---|---|
| committer | Chris Wilson | 2010-10-28 00:31:03 +0200 |
| commit | 3cce469cab880ef8990d2d16d745bf85443fc998 (patch) | |
| tree | 929b8ae6f2a693d2a793e8ddd82d5c0957b2414d /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | drm/i915: Remove the confusing global waiting/irq seqno (diff) | |
| download | kernel-qcow2-linux-3cce469cab880ef8990d2d16d745bf85443fc998.tar.gz kernel-qcow2-linux-3cce469cab880ef8990d2d16d745bf85443fc998.tar.xz kernel-qcow2-linux-3cce469cab880ef8990d2d16d745bf85443fc998.zip | |
drm/i915: Propagate error from failing to queue a request
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 | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 78fa6a249964..2d4a6968cd76 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -221,11 +221,12 @@ static int intel_overlay_do_wait_request(struct intel_overlay *overlay, int ret; BUG_ON(overlay->last_flip_req); - overlay->last_flip_req = - i915_add_request(dev, NULL, request, &dev_priv->render_ring); - if (overlay->last_flip_req == 0) - return -ENOMEM; - + ret = i915_add_request(dev, NULL, request, &dev_priv->render_ring); + if (ret) { + kfree(request); + return ret; + } + overlay->last_flip_req = request->seqno; overlay->flip_tail = tail; ret = i915_do_wait_request(dev, overlay->last_flip_req, true, @@ -363,8 +364,13 @@ static int intel_overlay_continue(struct intel_overlay *overlay, OUT_RING(flip_addr); ADVANCE_LP_RING(); - overlay->last_flip_req = - i915_add_request(dev, NULL, request, &dev_priv->render_ring); + ret = i915_add_request(dev, NULL, request, &dev_priv->render_ring); + if (ret) { + kfree(request); + return ret; + } + + overlay->last_flip_req = request->seqno; return 0; } |