On su, 2016-08-07 at 15:45 +0100, Chris Wilson wrote: > It's an outright programming error, so explode if it is ever hit. > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_gem_request.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c > index c6f523e2879c..0092f5e90cb2 100644 > --- a/drivers/gpu/drm/i915/i915_gem_request.c > +++ b/drivers/gpu/drm/i915/i915_gem_request.c > @@ -463,18 +463,12 @@ static void i915_gem_mark_busy(const struct intel_engine_cs *engine) > */ > void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches) > { > - struct intel_engine_cs *engine; > - struct intel_ring *ring; > + struct intel_engine_cs *engine = request->engine; > + struct intel_ring *ring = request->ring; > u32 request_start; > u32 reserved_tail; > int ret; > > - if (WARN_ON(!request)) > - return; > - > - engine = request->engine; > - ring = request->ring; > - > /* > * To ensure that this call will not fail, space for its emissions > * should already have been reserved in the ring buffer. Let the ring -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx