OSDN Git Service

drm/i915: Always flush the active worker before returning from the wait
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 21 Jan 2021 23:28:07 +0000 (23:28 +0000)
committerJani Nikula <jani.nikula@intel.com>
Tue, 26 Jan 2021 13:45:54 +0000 (15:45 +0200)
commitf6e98a1809faa02f40e0d089d6cfc1aa372a34c0
treeeb3e180fcf2557e31f5a99f8da9a2daf861deed6
parent3d480fe1befa0ef434f5c25199e7d45c26870555
drm/i915: Always flush the active worker before returning from the wait

The first thing the active retirement worker does is decrement the
i915_active count.

The first thing we do during i915_active_wait is try to increment the
i915_active count, but only if already active [non-zero].

The wait may see that the retirement is already started and so marked the
i915_active as idle, and skip waiting for the retirement handler.
However, the caller of i915_active_wait may immediately free the
i915_active upon returning (e.g. i915_vma_destroy) so we must not return
before the concurrent access from the worker is completed. We must
always flush the worker.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2473
Fixes: 274cbf20fd10 ("drm/i915: Push the i915_active.retire into a worker")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: <stable@vger.kernel.org> # v5.5+
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210121232807.16618-1-chris@chris-wilson.co.uk
(cherry picked from commit 977a372e972cb42799746c284035a33c64ebace9)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_active.c