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 v6.2-rc6 into drm-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
gem
/
i915_gem_mman.c
diff --git
a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 4f69bff6306828d206318a60f04e1c5d775242bf..2aac6bf7874039b7eeddd96055eae04adb98b974 100644
(file)
--- a/
drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/
drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@
-697,7
+697,7
@@
insert:
GEM_BUG_ON(lookup_mmo(obj, mmap_type) != mmo);
out:
if (file)
- drm_vma_node_allow(&mmo->vma_node, file);
+ drm_vma_node_allow
_once
(&mmo->vma_node, file);
return mmo;
err: