fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-24 21:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix proc formatting broken by last commit.

Browse source 
GPU lockup error reporting.
This commit is contained in:
Thomas Hellstrom 2006-09-22 09:25:36 +02:00
parent fa511a3ff5
commit a02155a0d9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
linux-core/drm_fence.c
View file

@ -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) {

2
linux-core/drm_proc.c
View file

@ -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,