diff options
| author | Nick Hoath | 2015-09-21 15:02:29 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-23 17:33:55 +0200 |
| commit | cd1736ad0a6f0f7a31773ddf90040bd15969bc21 (patch) | |
| tree | 06e54993206f58f7006d4cb7b121eca0e142c216 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Enable querying offset of UV plane with intel_plane_obj_offset (diff) | |
| download | kernel-qcow2-linux-cd1736ad0a6f0f7a31773ddf90040bd15969bc21.tar.gz kernel-qcow2-linux-cd1736ad0a6f0f7a31773ddf90040bd15969bc21.tar.xz kernel-qcow2-linux-cd1736ad0a6f0f7a31773ddf90040bd15969bc21.zip | |
drm/i915: Remove extraneous request cancel.
Remove extraneous request cancel in request allocation failure path
in intel_lr_context_deferred_alloc (Tvrtko Ursulin)
Regression from:
commit e84fe80337dc85cca07d0417ea97edbec4789d8b
Author: Nick Hoath <nicholas.hoath@intel.com>
Date: Fri Sep 11 12:53:46 2015 +0100
drm/i915: Split alloc from init for lrc
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7417650ed9cf..256167b2e2ab 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -2487,7 +2487,6 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, if (ret) { DRM_ERROR("ring create req: %d\n", ret); - i915_gem_request_cancel(req); goto error_ringbuf; } |