Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd1736ad authored by Nick Hoath's avatar Nick Hoath Committed by Daniel Vetter
Browse files

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 e84fe803
  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: default avatarNick Hoath <nicholas.hoath@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dedf278c

drivers/gpu/drm/i915/intel_lrc.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

		}