diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-12 15:00:51 +0000 |
|---|---|---|
| committer |   Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-11-18 16:35:57 +0200 |
| commit | 36104fcf8ff4dd0b0ca8a79bc3fb5b1046deead2 (patch) | |
| tree | d425e6c0721de14a112d0be9e15838596a0fb849 /drivers/gpu/drm/i915/gem/i915_gem_context.c | |
| parent | Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next (diff) | |
| download | linux-dev-36104fcf8ff4dd0b0ca8a79bc3fb5b1046deead2.tar.xz linux-dev-36104fcf8ff4dd0b0ca8a79bc3fb5b1046deead2.zip | |
drm/i915: Flush context free work on cleanup
Throw in a flush_work() to specifically flush the context cleanup work
before the module is unloaded.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112248
Fixes: a4e7ccdac38e ("drm/i915: Move context management under GEM")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191112150051.1603-1-chris@chris-wilson.co.uk
(cherry picked from commit 5f00cac921b1219bc9daf00d169385b4cb3916ce)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 09f84f0ad0f4..255ab040022e 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -727,6 +727,7 @@ int i915_gem_init_contexts(struct drm_i915_private *i915) void i915_gem_driver_release__contexts(struct drm_i915_private *i915) { destroy_kernel_context(&i915->kernel_context); + flush_work(&i915->gem.contexts.free_work); } static int context_idr_cleanup(int id, void *p, void *data) |