Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:57:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_vma.c
Log Message:
i915: Lock outside #ifdef NetBSD, not just unlock.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.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/i915_vma.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c:1.7 Sun Dec 19 11:55:58 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c Sun Dec 19 11:57:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_vma.c,v 1.7 2021/12/19 11:55:58 riastradh Exp $ */
+/* $NetBSD: i915_vma.c,v 1.8 2021/12/19 11:57:11 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.7 2021/12/19 11:55:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.8 2021/12/19 11:57:11 riastradh Exp $");
#include <linux/sched/mm.h>
#include <drm/drm_gem.h>
@@ -229,6 +229,8 @@ vma_create(struct drm_i915_gem_object *o
__set_bit(I915_VMA_GGTT_BIT, __i915_vma_flags(vma));
}
+ spin_lock(&obj->vma.lock);
+
#ifdef __NetBSD__
__USE(rb);
__USE(p);
@@ -236,8 +238,6 @@ vma_create(struct drm_i915_gem_object *o
collision = rb_tree_insert_node(&obj->vma.tree.rbr_tree, vma);
KASSERT(collision == vma);
#else
- spin_lock(&obj->vma.lock);
-
rb = NULL;
p = &obj->vma.tree.rb_node;
while (*p) {
