diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-29 22:55:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-29 22:55:44 +0100 |
| commit | cb4d789f98e6e05ec29e5242887018c7450ddf10 (patch) | |
| tree | 4420a01341af54dc79b6c2729a0182376145a63c /src | |
| parent | 0fd680ff52f7ce0a101c617dfb8997c4e228e3ad (diff) | |
sna: Disable the warning for a hung GPU is we manually set wedged
Only warn about a hung GPU if we encounter an EIO during operation, but
don't warn if we set wedged during initialisation based on unsupported
hw or user request.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/kgem.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 204b40f3..515b1ae0 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -2238,19 +2238,17 @@ void _kgem_submit(struct kgem *kgem) void kgem_throttle(struct kgem *kgem) { - static int warned; + kgem->need_throttle = 0; + if (kgem->wedged) + return; - kgem->wedged |= __kgem_throttle(kgem); - DBG(("%s: wedged=%d\n", __FUNCTION__, kgem->wedged)); - if (kgem->wedged && !warned) { + kgem->wedged = __kgem_throttle(kgem); + if (kgem->wedged) { xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR, "Detected a hung GPU, disabling acceleration.\n"); xf86DrvMsg(kgem_get_screen_index(kgem), X_ERROR, "When reporting this, please include i915_error_state from debugfs and the full dmesg.\n"); - warned = 1; } - - kgem->need_throttle = 0; } void kgem_purge_cache(struct kgem *kgem) |