diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
| commit | d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a (patch) | |
| tree | f43b81751cb5c5736268057ecdbcdb99dd00e826 /drivers/gpu/drm/i915/i915_active.c | |
| parent | Merge branch 'rework-the-memory-barrier-for-scrq-entry' (diff) | |
| parent | Merge tag 'clang-format-for-linux-v5.11-rc7' of git://github.com/ojeda/linux (diff) | |
| download | wireguard-linux-d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a.tar.xz wireguard-linux-d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_active.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_active.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c index 10a865f3dc09..9ed19b8bca60 100644 --- a/drivers/gpu/drm/i915/i915_active.c +++ b/drivers/gpu/drm/i915/i915_active.c @@ -631,24 +631,26 @@ static int flush_lazy_signals(struct i915_active *ref) int __i915_active_wait(struct i915_active *ref, int state) { - int err; - might_sleep(); - if (!i915_active_acquire_if_busy(ref)) - return 0; - /* Any fence added after the wait begins will not be auto-signaled */ - err = flush_lazy_signals(ref); - i915_active_release(ref); - if (err) - return err; + if (i915_active_acquire_if_busy(ref)) { + int err; - if (!i915_active_is_idle(ref) && - ___wait_var_event(ref, i915_active_is_idle(ref), - state, 0, 0, schedule())) - return -EINTR; + err = flush_lazy_signals(ref); + i915_active_release(ref); + if (err) + return err; + if (___wait_var_event(ref, i915_active_is_idle(ref), + state, 0, 0, schedule())) + return -EINTR; + } + + /* + * After the wait is complete, the caller may free the active. + * We have to flush any concurrent retirement before returning. + */ flush_work(&ref->work); return 0; } |