[src/trunk]: src/sys/external/bsd/drm2/dist/drm New seqlock code requires seq...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c87c93f009e
branches:  trunk
changeset: 1027960:4c87c93f009e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:21:53 2021 +0000

description:
New seqlock code requires seqlock_destroy.

XXX missing cases in drm56

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_vblank.c              |  8 ++++++--
 sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c |  5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r f325c3ff42e1 -r 4c87c93f009e sys/external/bsd/drm2/dist/drm/drm_vblank.c
--- a/sys/external/bsd/drm2/dist/drm/drm_vblank.c       Sun Dec 19 01:21:45 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_vblank.c       Sun Dec 19 01:21:53 2021 +0000
@@ -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 @@
                        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);
diff -r f325c3ff42e1 -r 4c87c93f009e sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c  Sun Dec 19 01:21:45 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_cs.c  Sun Dec 19 01:21:53 2021 +0000
@@ -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 @@
        enum intel_engine_id id;
 
        for_each_engine(engine, gt, id) {
+               seqlock_destroy(&engine->stats.lock);
                kfree(engine);
                gt->engine[id] = NULL;
        }