Skip to contentSkip to conversation

drm/i915: Remove extraneous request cancel.

PATCH Applied Nick Hoath 3 participants 3 messages Sep 21, 2015 – Sep 23, 2015

Subsystems (2)
lore
Share & tools
lore

Nick Hoath

author
#0 lore raw

PATCH 1/1 drm/i915: Remove extraneous request cancel.

Remove extraneous request cancel in request allocation failure path in intel_lr_context_deferred_alloc (Tvrtko Ursulin)

Cc Tvrtko Ursulin <[email protected]>
---
 drivers/gpu/drm/i915/intel_lrc.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_lrc.c +0 -1
index fe06accb0..3a50de6 100644
@@ -2488,7 +2488,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;
 		}
 
Signature · 6 lines
2.1.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Nick Hoath

Remove extraneous request cancel in request allocation failure path in intel_lr_context_deferred_alloc (Tvrtko Ursulin)

Cc Tvrtko Ursulin <[email protected]>
---
  drivers/gpu/drm/i915/intel_lrc.c | 1 -
  1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_lrc.c +0 -0
index fe06accb0..3a50de6 100644

drivers/gpu/drm/i915/intel_lrc.c int intel_lr_context_deferred_alloc(struct intel_context *ctx, · line 2493

Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +0 -1
@@ -2488,7 +2488,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;
  		}
 

Could add to the commit that popular blurb of:

Regression from:

commit e84fe80337dc85cca07d0417ea97edbec4789d8b
Author: Nick Hoath <[email protected]>
Date: Fri Sep 11 12:53:46 2015 +0100

drm/i915: Split alloc from init for lrc

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 29 lines · Tvrtko Ursulin
Quoted 15 lines · Nick Hoath

Remove extraneous request cancel in request allocation failure path in intel_lr_context_deferred_alloc (Tvrtko Ursulin)

Cc Tvrtko Ursulin <[email protected]>
---
 drivers/gpu/drm/i915/intel_lrc.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_lrc.c +0 -0
index fe06accb0..3a50de6 100644

drivers/gpu/drm/i915/intel_lrc.c int intel_lr_context_deferred_alloc(struct intel_context *ctx, · line 2493

Quoted 7 lines
drivers/gpu/drm/i915/intel_lrc.c +0 -1
@@ -2488,7 +2488,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;
 		}
 

Could add to the commit that popular blurb of:

Quoted 7 lines

Regression from:

commit e84fe80337dc85cca07d0417ea97edbec4789d8b
Author: Nick Hoath <[email protected]>
Date: Fri Sep 11 12:53:46 2015 +0100

drm/i915: Split alloc from init for lrc

Very much appreciated to dig the regression citation out, this is absolutely an integral part of the commit message. Smashing an r-b onto a regression fix without that would just be not doing the full job for a review. Nick, please add this yourself next time around.

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx