|
@@ -91,14 +91,11 @@ i915_gem_wait_for_error(struct i915_gpu_error *error)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
-#define EXIT_COND (!i915_reset_in_progress(error))
|
|
|
|
|
|
+#define EXIT_COND (!i915_reset_in_progress(error) || \
|
|
|
|
+ i915_terminally_wedged(error))
|
|
if (EXIT_COND)
|
|
if (EXIT_COND)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- /* GPU is already declared terminally dead, give up. */
|
|
|
|
- if (i915_terminally_wedged(error))
|
|
|
|
- return -EIO;
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Only wait 10 seconds for the gpu reset to complete to avoid hanging
|
|
* Only wait 10 seconds for the gpu reset to complete to avoid hanging
|
|
* userspace. If it takes that long something really bad is going on and
|
|
* userspace. If it takes that long something really bad is going on and
|