git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gvt-fixes-2020-02-12' of https://github.com/intel/gvt-linux into drm-intel...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
gvt
/
gtt.c
diff --git
a/drivers/gpu/drm/i915/gvt/gtt.c
b/drivers/gpu/drm/i915/gvt/gtt.c
index 34cb404ba4b789ca97c86794d90c24edf3cf95ef..4a4828074cb708b09b764f295f28f80fa137d14c 100644
(file)
--- a/
drivers/gpu/drm/i915/gvt/gtt.c
+++ b/
drivers/gpu/drm/i915/gvt/gtt.c
@@
-1956,7
+1956,11
@@
void _intel_vgpu_mm_release(struct kref *mm_ref)
if (mm->type == INTEL_GVT_MM_PPGTT) {
list_del(&mm->ppgtt_mm.list);
if (mm->type == INTEL_GVT_MM_PPGTT) {
list_del(&mm->ppgtt_mm.list);
+
+ mutex_lock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock);
list_del(&mm->ppgtt_mm.lru_list);
list_del(&mm->ppgtt_mm.lru_list);
+ mutex_unlock(&mm->vgpu->gvt->gtt.ppgtt_mm_lock);
+
invalidate_ppgtt_mm(mm);
} else {
vfree(mm->ggtt_mm.virtual_ggtt);
invalidate_ppgtt_mm(mm);
} else {
vfree(mm->ggtt_mm.virtual_ggtt);