Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Use throttle() to confirm a GPU hang 

This has two effects. The first is that we confirm that the EIO was
indeed a GPU hang and not some other form of I/O failure (for example
swapin). And the second is that it means we also print the warning to
look for an i915_error_state when we detect a GPU hang.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-04 21:43:22 +01:00
parent b8c2b34e39
commit f2fdb0da83
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sna/kgem.c
View File

@ -1604,7 +1604,7 @@ static void kgem_commit(struct kgem *kgem)
set_domain.write_domain = I915_GEM_DOMAIN_GTT;
if (drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain)) {
DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
kgem->wedged = 1;
kgem_throttle(kgem);
}
kgem_retire(kgem);
@ -1983,7 +1983,7 @@ void _kgem_submit(struct kgem *kgem)
}
if (ret == -1 && (errno == EIO || errno == EBUSY)) {
DBG(("%s: GPU hang detected\n", __FUNCTION__));
kgem->wedged = 1;
kgem_throttle(kgem);
ret = 0;
}
#if !NDEBUG
@ -2047,7 +2047,7 @@ void _kgem_submit(struct kgem *kgem)
ret = drmIoctl(kgem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain);
if (ret == -1) {
DBG(("%s: sync: GPU hang detected\n", __FUNCTION__));
kgem->wedged = 1;
kgem_throttle(kgem);
}
}
}