]> Pileus Git - ~andy/linux/commitdiff
drm/i915: tune reset dmesg output a bit
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 7 Nov 2013 08:48:57 +0000 (09:48 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 11 Nov 2013 19:15:59 +0000 (20:15 +0100)
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>
drivers/gpu/drm/i915/i915_drv.c

index 38a344694e35ded5fb33b0740a728e5fb437f70f..c3e9485f38feedd4530fec8c310703785b8d5349 100644 (file)
@@ -731,14 +731,14 @@ int i915_reset(struct drm_device *dev)
                DRM_INFO("Simulated gpu hang, resetting stop_rings\n");
                dev_priv->gpu_error.stop_rings = 0;
                if (ret == -ENODEV) {
-                       DRM_ERROR("Reset not implemented, but ignoring "
-                                 "error for simulated gpu hangs\n");
+                       DRM_INFO("Reset not implemented, but ignoring "
+                                "error for simulated gpu hangs\n");
                        ret = 0;
                }
        }
 
        if (ret) {
-               DRM_ERROR("Failed to reset chip.\n");
+               DRM_ERROR("Failed to reset chip: %i\n", ret);
                mutex_unlock(&dev->struct_mutex);
                return ret;
        }