From a02155a0d92d3933d42a3655db261446bfe72b44 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri, 22 Sep 2006 09:25:36 +0200
Subject: Fix proc formatting broken by last commit. GPU lockup error
 reporting.

---
 linux-core/drm_fence.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'linux-core/drm_fence.c')

diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index cb7aee09..0640e755 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -299,9 +299,12 @@ int drm_fence_object_wait(drm_device_t * dev, drm_fence_object_t * fence,
 		} while (ret == -EINTR && ignore_signals);
 		if (time_after_eq(jiffies, _end) && (ret != 0))
 			ret = -EBUSY;
-		if (ret)
+		if (ret) {
+			if (ret == -EBUSY) {
+				DRM_ERROR("Fence timout. GPU lockup.\n");
+			}
 			return ((ret == -EINTR) ? -EAGAIN : ret);
-
+		}
 	} else if ((fence->class == 0) && (mask & DRM_FENCE_TYPE_EXE) &&
 		   driver->lazy_capable) {
 
-- 
cgit v1.2.3