Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:07:20 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
i915: Simplify releasing mmap offsets; don't release if not mapped.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.12 Sun Dec 19 12:07:11 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Dec 19 12:07:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.12 2021/12/19 12:07:11 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.13 2021/12/19 12:07:20 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.12 2021/12/19 12:07:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.13 2021/12/19 12:07:20 riastradh Exp $");
#include <linux/anon_inodes.h>
#include <linux/mman.h>
@@ -684,33 +684,22 @@ out:
void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj)
{
- struct i915_mmap_offset *mmo, *mn;
-
- spin_lock(&obj->mmo.lock);
#ifdef __NetBSD__
- enum i915_mmap_type t;
struct page *page;
struct vm_page *vm_page;
unsigned i;
- (void)mmo;
- (void)mn;
- for (t = 0; t < I915_MMAP_NTYPES; t++) {
- if (t == I915_MMAP_TYPE_GTT)
- continue;
- for (i = 0; i < obj->base.size >> PAGE_SHIFT; i++) {
- page = obj->mm.pages->sgl->sg_pgs[i];
- vm_page = &page->p_vmp;
- /*
- * XXX Why do we have to have the spin lock
- * here at all?
- */
- spin_unlock(&obj->mmo.lock);
- pmap_page_protect(vm_page, VM_PROT_NONE);
- spin_lock(&obj->mmo.lock);
- }
+ if (obj->mm.pages == NULL)
+ return;
+ for (i = 0; i < obj->base.size >> PAGE_SHIFT; i++) {
+ page = obj->mm.pages->sgl->sg_pgs[i];
+ vm_page = &page->p_vmp;
+ pmap_page_protect(vm_page, VM_PROT_NONE);
}
#else
+ struct i915_mmap_offset *mmo, *mn;
+
+ spin_lock(&obj->mmo.lock);
rbtree_postorder_for_each_entry_safe(mmo, mn,
&obj->mmo.offsets, offset) {
/*
@@ -725,8 +714,8 @@ void i915_gem_object_release_mmap_offset
obj->base.dev->anon_inode->i_mapping);
spin_lock(&obj->mmo.lock);
}
-#endif
spin_unlock(&obj->mmo.lock);
+#endif
}
/**
