| Message ID | 1442840549-687-1-git-send-email-nicholas.hoath@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/21/2015 02:02 PM, Nick Hoath wrote: > Remove extraneous request cancel in request allocation failure path > in intel_lr_context_deferred_alloc (Tvrtko Ursulin) > > Signed-off-by: Nick Hoath <nicholas.hoath@intel.com> > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > --- > drivers/gpu/drm/i915/intel_lrc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index fe06accb0..3a50de6 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -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; > } > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Could add to the commit that popular blurb of: 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 Regards, Tvrtko
On Mon, Sep 21, 2015 at 02:31:59PM +0100, Tvrtko Ursulin wrote: > > On 09/21/2015 02:02 PM, Nick Hoath wrote: > >Remove extraneous request cancel in request allocation failure path > >in intel_lr_context_deferred_alloc (Tvrtko Ursulin) > > > >Signed-off-by: Nick Hoath <nicholas.hoath@intel.com> > > > >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > >--- > > drivers/gpu/drm/i915/intel_lrc.c | 1 - > > 1 file changed, 1 deletion(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > >index fe06accb0..3a50de6 100644 > >--- a/drivers/gpu/drm/i915/intel_lrc.c > >+++ b/drivers/gpu/drm/i915/intel_lrc.c > >@@ -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; > > } > > > > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Could add to the commit that popular blurb of: > > 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 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
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index fe06accb0..3a50de6 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -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; }
Remove extraneous request cancel in request allocation failure path in intel_lr_context_deferred_alloc (Tvrtko Ursulin) Signed-off-by: Nick Hoath <nicholas.hoath@intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> --- drivers/gpu/drm/i915/intel_lrc.c | 1 - 1 file changed, 1 deletion(-)