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

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 01:21:53 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm: drm_vblank.c
        src/sys/external/bsd/drm2/dist/drm/i915/gt: intel_engine_cs.c

Log Message:
New seqlock code requires seqlock_destroy.

XXX missing cases in drm56


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/drm_vblank.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.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_vblank.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.3 src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/drm_vblank.c:1.3	Sun Dec 19 01:16:51 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_vblank.c	Sun Dec 19 01:21:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_vblank.c,v 1.3 2021/12/19 01:16:51 riastradh Exp $	*/
+/*	$NetBSD: drm_vblank.c,v 1.4 2021/12/19 01:21:53 riastradh Exp $	*/
 
 /*
  * drm_irq.c IRQ and vblank support
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vblank.c,v 1.3 2021/12/19 01:16:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vblank.c,v 1.4 2021/12/19 01:21:53 riastradh Exp $");
 
 #include <linux/export.h>
 #include <linux/moduleparam.h>
@@ -441,6 +441,10 @@ void drm_vblank_cleanup(struct drm_devic
 			drm_core_check_feature(dev, DRIVER_MODESET));
 
 		del_timer_sync(&vblank->disable_timer);
+#ifdef __NetBSD__
+		teardown_timer(&vblank->disable_timer);
+		seqlock_destroy(&vblank->seqlock);
+#endif
 	}
 
 	kfree(dev->vblank);

Index: src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c:1.2	Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c	Sun Dec 19 01:21:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_engine_cs.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $	*/
+/*	$NetBSD: intel_engine_cs.c,v 1.3 2021/12/19 01:21:53 riastradh Exp $	*/
 
 /*
  * Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_engine_cs.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_engine_cs.c,v 1.3 2021/12/19 01:21:53 riastradh Exp $");
 
 #include <drm/drm_print.h>
 
@@ -417,6 +417,7 @@ void intel_engines_free(struct intel_gt 
 	enum intel_engine_id id;
 
 	for_each_engine(engine, gt, id) {
+		seqlock_destroy(&engine->stats.lock);
 		kfree(engine);
 		gt->engine[id] = NULL;
 	}