diff options
author | Dave Airlie <airlied@redhat.com> | 2017-06-16 05:58:27 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-06-16 05:58:27 +0200 |
commit | 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c (patch) | |
tree | bd4110dc5a3b70a5674b9d6d5340cc1889f5d6e8 /drivers/gpu/drm/i915/intel_uc.h | |
parent | Merge tag 'imx-drm-next-2017-06-08' of git://git.pengutronix.de/git/pza/linux... (diff) | |
parent | Linux 4.12-rc5 (diff) | |
download | linux-925344ccc91d7a7fd84cab2dece1c34bbd86fd8c.tar.xz linux-925344ccc91d7a7fd84cab2dece1c34bbd86fd8c.zip |
BackMerge tag 'v4.12-rc5' into drm-next
Linux 4.12-rc5 for nouveau fixes
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_uc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 69daf4c01cd0..22ae52b17b0f 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -59,6 +59,10 @@ struct drm_i915_gem_request; * available in the work queue (note, the queue is shared, * not per-engine). It is OK for this to be nonzero, but * it should not be huge! + * b_fail: failed to ring the doorbell. This should never happen, unless + * somehow the hardware misbehaves, or maybe if the GuC firmware + * crashes? We probably need to reset the GPU to recover. + * retcode: errno from last guc_submit() */ struct i915_guc_client { struct i915_vma *vma; |