CVS commit: src/sys/external/bsd/drm2/dist/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:58:50 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm: drm_gem.c
        src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_object.c

Log Message:
drm: Destroy struct drm_gem_object::vma_node after use.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/drm_gem.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.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/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.22 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.22	Sun Dec 19 11:32:53 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c	Sun Dec 19 11:58:49 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_gem.c,v 1.22 2021/12/19 11:32:53 riastradh Exp $	*/
+/*	$NetBSD: drm_gem.c,v 1.23 2021/12/19 11:58:49 riastradh Exp $	*/
 
 /*
  * Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.22 2021/12/19 11:32:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem.c,v 1.23 2021/12/19 11:58:49 riastradh Exp $");
 
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -1064,7 +1064,6 @@ drm_gem_object_release(struct drm_gem_ob
 #endif
 
 #ifdef __NetBSD__
-	drm_vma_node_destroy(&obj->vma_node);
 	if (obj->filp)
 		uao_detach(obj->filp);
 	uvm_obj_destroy(&obj->gemo_uvmobj, /*free lock*/true);
@@ -1075,6 +1074,9 @@ drm_gem_object_release(struct drm_gem_ob
 
 	dma_resv_fini(&obj->_resv);
 	drm_gem_free_mmap_offset(obj);
+#ifdef __NetBSD__
+	drm_vma_node_destroy(&obj->vma_node);
+#endif
 }
 EXPORT_SYMBOL(drm_gem_object_release);
 

Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.6	Sun Dec 19 11:58:41 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c	Sun Dec 19 11:58:50 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_gem_object.c,v 1.6 2021/12/19 11:58:41 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_object.c,v 1.7 2021/12/19 11:58:50 riastradh Exp $	*/
 
 /*
  * Copyright © 2017 Intel Corporation
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_object.c,v 1.6 2021/12/19 11:58:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_object.c,v 1.7 2021/12/19 11:58:50 riastradh Exp $");
 
 #include <linux/bitmap.h>
 #include <linux/sched/mm.h>
@@ -178,6 +178,7 @@ static void __i915_gem_free_object_rcu(s
 	struct drm_i915_private *i915 = to_i915(obj->base.dev);
 
 	dma_resv_fini(&obj->base._resv);
+	drm_vma_node_destroy(&obj->base.vma_node);
 	i915_gem_object_free(obj);
 
 	GEM_BUG_ON(!atomic_read(&i915->mm.free_count));