drm/i915: Report if i915_active is still busy upon waiting
If we try to wait on an i915_active from within a critical section, it
will remain busy (such as if we are shrinking from within
i915_active_ref). Report the failure so that we do not proceed thinking
it is idle.
Extracted from a future patch "drm/i915: Coordinate i915_active with its
own mutex".
Fixes: 12c255b5da
("drm/i915: Provide an i915_active.acquire callback")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190702092117.1707-1-chris@chris-wilson.co.uk
This commit is contained in:
parent
8759aa4cc1
commit
afd1bcd4ad
|
@ -287,7 +287,13 @@ int i915_active_wait(struct i915_active *ref)
|
|||
}
|
||||
|
||||
__active_retire(ref);
|
||||
return err;
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!i915_active_is_idle(ref))
|
||||
return -EBUSY;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int i915_request_await_active_request(struct i915_request *rq,
|
||||
|
|
Loading…
Reference in New Issue