From: Nick Hoath <nicholas.hoath@intel.com>
Date: Mon, 21 Sep 2015 13:02:29 +0000 (+0100)
Subject: drm/i915: Remove extraneous request cancel.
X-Git-Tag: KARO-TX6UL-2015-11-03~85^2~15^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cd1736ad0a6f0f7a31773ddf90040bd15969bc21;p=karo-tx-linux.git

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>
---

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;
 		}