From: Chris Wilson Date: Fri, 21 Jul 2017 12:32:28 +0000 (+0100) Subject: drm/i915: Assert that machine is wedged for nop_submit_request X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf2eac3bee51299bd08dcbd25f7bd8dbaaff1b62;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Assert that machine is wedged for nop_submit_request We should only ever do nop_submit_request when the machine is wedged, so assert it is so. Signed-off-by: Chris Wilson Reviewed-by: Michel Thierry Link: https://patchwork.freedesktop.org/patch/msgid/20170721123238.16428-10-chris@chris-wilson.co.uk Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a01176dd4bae..2ff5e23406e5 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3026,6 +3026,7 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv) static void nop_submit_request(struct drm_i915_gem_request *request) { + GEM_BUG_ON(!i915_terminally_wedged(&request->i915->gpu_error)); dma_fence_set_error(&request->fence, -EIO); i915_gem_request_submit(request); intel_engine_init_global_seqno(request->engine, request->global_seqno);