diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-07 20:58:50 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-09 07:30:49 +0000 |
| commit | d151e9ce9876a134d9c46e191d920292d47d302e (patch) | |
| tree | 0629a0c77e4096bb3feb3035d28232aa0c2d09ed /drivers/gpu/drm/i915/i915_gem_userptr.c | |
| parent | drm/i915/userptr: Deactivate a failed userptr if the worker reports an EFAULT (diff) | |
| download | linux-dev-d151e9ce9876a134d9c46e191d920292d47d302e.tar.xz linux-dev-d151e9ce9876a134d9c46e191d920292d47d302e.zip | |
drm/i915/userptr: Only flush the workqueue if required
To avoid waiting for work from other invalidate-range threads where
not required, only wait on the userptr cancel workqueue if we have added
some work to it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170307205851.32578-2-chris@chris-wilson.co.uk
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_userptr.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_userptr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 6ef05d5b884d..dc9bf5282071 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -145,7 +145,8 @@ static void i915_gem_userptr_mn_invalidate_range_start(struct mmu_notifier *_mn, del_object(mo); spin_unlock(&mn->lock); - flush_workqueue(mn->wq); + if (!list_empty(&cancelled)) + flush_workqueue(mn->wq); } static const struct mmu_notifier_ops i915_gem_userptr_notifier = { |