Attachment 88811 Details for Bug 71333 – tune reset warnings down a notch

[patch] tune reset warnings down a notch

0001-drm-i915-tune-reset-dmesg-output-a-bit.patch (text/plain), 1.29 KB, created by Daniel Vetter on 2013-11-07 08:42:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-11-07 08:42:53 UTC

Size: 1.29 KB

patch

obsolete

>From d4fddd1a9869b7160ffe384c6d126054d3c60f5f Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Thu, 7 Nov 2013 09:41:14 +0100
>Subject: [PATCH] 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
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/i915_drv.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index 65447572b129..d158b0660d1e 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -727,14 +727,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;
> 	}
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 71333: 88808 | 88811

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.