diff options
| -rw-r--r-- | linux-core/drm_fence.c | 7 | ||||
| -rw-r--r-- | linux-core/drm_proc.c | 2 | 
2 files changed, 6 insertions, 3 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) { diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c index 2efade26..6a0ee4fe 100644 --- a/linux-core/drm_proc.c +++ b/linux-core/drm_proc.c @@ -238,7 +238,7 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request,  			type = "??";  		else  			type = types[map->type]; -		DRM_PROC_PRINT("%4d 0x%16lx 0x%16lx %4.4s  0x%02x 0x%16lx ", +		DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s  0x%02x 0x%08lx ",  			       i,  			       map->offset,  			       map->size, type, map->flags,   | 
