diff options
| author | Chris Wilson | 2017-12-11 21:40:40 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-12-12 22:07:40 +0100 |
| commit | 3ef98f50ca7cef5cc9b9bf89cd46830afbf4df68 (patch) | |
| tree | 0f5bae5db395feb9e959ab7e981aab98638d054a /drivers/gpu/drm/i915/i915_drv.c | |
| parent | docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c (diff) | |
| download | kernel-qcow2-linux-3ef98f50ca7cef5cc9b9bf89cd46830afbf4df68.tar.gz kernel-qcow2-linux-3ef98f50ca7cef5cc9b9bf89cd46830afbf4df68.tar.xz kernel-qcow2-linux-3ef98f50ca7cef5cc9b9bf89cd46830afbf4df68.zip | |
drm/i915: Print an error message for a reset failure on gen2
Since on gen2, we do not universally have a GPU reset implementation, we
fail i915_reset() at intel_has_gpu_reset(). However, this is also
intentionally disabled for CI testing and so it only has a debug
message. Promote that debug message to a user-facing error message that
should explain why their machine became unusable following the GPU hang.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171211204040.22858-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 54a8fca7e7b2..721ccce1832f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1903,7 +1903,10 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags) } if (!intel_has_gpu_reset(i915)) { - DRM_DEBUG_DRIVER("GPU reset disabled\n"); + if (i915_modparams.reset) + dev_err(i915->drm.dev, "GPU reset not supported\n"); + else + DRM_DEBUG_DRIVER("GPU reset disabled\n"); goto error; } |