aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-07 03:48:57 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-11 14:15:59 -0500
commitf2d91a2c556479713abbefec237cad4bc1d54b0d (patch)
treee2f6b55cc0d3dc6b444be3171e9a4b06f635874a
parente4607fcfb1cd5d869425e190a85f841fc910c4ca (diff)
drm/i915: tune reset dmesg output a bit
We don't want any ERROR for simulated gpu hangs, otoh printing the error code when the reset failed for real should be interesting. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71333 lu hua <huax.lu@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 38a344694e35..c3e9485f38fe 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -731,14 +731,14 @@ int i915_reset(struct drm_device *dev)
731 DRM_INFO("Simulated gpu hang, resetting stop_rings\n"); 731 DRM_INFO("Simulated gpu hang, resetting stop_rings\n");
732 dev_priv->gpu_error.stop_rings = 0; 732 dev_priv->gpu_error.stop_rings = 0;
733 if (ret == -ENODEV) { 733 if (ret == -ENODEV) {
734 DRM_ERROR("Reset not implemented, but ignoring " 734 DRM_INFO("Reset not implemented, but ignoring "
735 "error for simulated gpu hangs\n"); 735 "error for simulated gpu hangs\n");
736 ret = 0; 736 ret = 0;
737 } 737 }
738 } 738 }
739 739
740 if (ret) { 740 if (ret) {
741 DRM_ERROR("Failed to reset chip.\n"); 741 DRM_ERROR("Failed to reset chip: %i\n", ret);
742 mutex_unlock(&dev->struct_mutex); 742 mutex_unlock(&dev->struct_mutex);
743 return ret; 743 return ret;
744 } 744 }