summaryrefslogtreecommitdiff
path: root/linux-core/drm_fence.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-22 09:25:36 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-09-22 09:25:36 +0200
commita02155a0d92d3933d42a3655db261446bfe72b44 (patch)
treebb4809003ff153aa1cbb6bb51a56a8336a85b793 /linux-core/drm_fence.c
parentfa511a3ff5150d932fd963594d1ef67a94bb8b1f (diff)
Fix proc formatting broken by last commit.
GPU lockup error reporting.
Diffstat (limited to 'linux-core/drm_fence.c')
-rw-r--r--linux-core/drm_fence.c7
1 files changed, 5 insertions, 2 deletions
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) {