diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2021-09-27 11:59:08 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-09-27 11:59:09 +0300 |
| commit | 5cb8742774d2f376732ab0becaa46d033319db6b (patch) | |
| tree | 52376a6e27f6bc5451f4d812fead0044f973d605 /drivers/gpu | |
| parent | Linux 5.15-rc3 (diff) | |
| parent | drm/i915/gvt: fix the usage of ww lock in gvt scheduler. (diff) | |
| download | linux-dev-5cb8742774d2f376732ab0becaa46d033319db6b.tar.xz linux-dev-5cb8742774d2f376732ab0becaa46d033319db6b.zip | |
Merge tag 'gvt-fixes-2021-09-18' of https://github.com/intel/gvt-linux into drm-intel-fixes
gvt-fixes-2021-09-18
- ww locking fix from Zhi
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210918071105.GY14689@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/scheduler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index b56a8e37a3cd..1bb1be5c48c8 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -576,7 +576,7 @@ retry: /* No one is going to touch shadow bb from now on. */ i915_gem_object_flush_map(bb->obj); - i915_gem_object_unlock(bb->obj); + i915_gem_ww_ctx_fini(&ww); } } return 0; @@ -630,7 +630,7 @@ retry: return ret; } - i915_gem_object_unlock(wa_ctx->indirect_ctx.obj); + i915_gem_ww_ctx_fini(&ww); /* FIXME: we are not tracking our pinned VMA leaving it * up to the core to fix up the stray pin_count upon |