diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-01-27 12:31:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-01-27 12:31:09 +1000 |
| commit | d23db89883962d9b4cb3ad03dfd02e525ed2cc03 (patch) | |
| tree | 522755ecf4283e74e87295c39aa59e351bc766ac /drivers/gpu/drm/i915/gem/i915_gem_mman.c | |
| parent | f439a959dcfb6b39d6fd4b85ca1110a1d1de1587 (diff) | |
| parent | d6591da5f3ff284a376d56b5f7a48a34e9cb159d (diff) | |
| download | linux-d23db89883962d9b4cb3ad03dfd02e525ed2cc03.tar.bz2 | |
Merge tag 'drm-misc-fixes-2023-01-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A fix and a preliminary patch to fix a memory leak in i915, and a use
after free fix for fbdev deferred io
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230126104018.cbrcjxl5wefdbb2f@houat
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_mman.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c index 0ad44f3868de..c7c252d4d366 100644 --- 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: |