From: Chris Wilson Date: Tue, 10 Jan 2017 17:22:43 +0000 (+0000) Subject: drm/i915: Set guilty-flag on fence after detecting a hang X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c0d5f32c5043e8568ffdbcff60dfba26f408fa10;p=openwrt%2Fstaging%2Fblogic.git drm/i915: Set guilty-flag on fence after detecting a hang The struct dma_fence carries a status field exposed to userspace by sync_file. This is inspected after the fence is signaled and can convey whether or not the request completed successfully, or in our case if we detected a hang during the request (signaled via -EIO in SYNC_IOC_FILE_INFO). v2: Mark all cancelled requests as failed. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Mika Kuoppala Reviewed-by: Tvrtko Ursulin Link: http://patchwork.freedesktop.org/patch/msgid/20170110172246.27297-2-chris@chris-wilson.co.uk --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fb2433175a3d..324a49813668 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2626,6 +2626,8 @@ static void reset_request(struct drm_i915_gem_request *request) head = 0; } memset(vaddr + head, 0, request->postfix - head); + + dma_fence_set_error(&request->fence, -EIO); } void i915_gem_reset_prepare(struct drm_i915_private *dev_priv)