[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display i915: Remember t...

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

details:   https://anonhg.NetBSD.org/src/rev/b61b6e1defd2
branches:  trunk
changeset: 1028751:b61b6e1defd2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:56:23 2021 +0000

description:
i915: Remember to initialize the atomic commit lock and waitqueue!

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 350bb2713a0b -r b61b6e1defd2 sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 11:56:08 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_display.c       Sun Dec 19 11:56:23 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.6 2021/12/19 11:56:08 riastradh Exp $      */
+/*     $NetBSD: intel_display.c,v 1.7 2021/12/19 11:56:23 riastradh Exp $      */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.6 2021/12/19 11:56:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.7 2021/12/19 11:56:23 riastradh Exp $");
 
 #include "intel_display.h"     /* for pipe_drmhack */
 
@@ -17562,6 +17562,9 @@
        i915->flip_wq = alloc_workqueue("i915_flip", WQ_HIGHPRI |
                                        WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE);
 
+       spin_lock_init(&i915->atomic_commit_lock);
+       DRM_INIT_WAITQUEUE(&i915->atomic_commit_wq, "i915cmit");
+
        intel_mode_config_init(i915);
 
        ret = intel_bw_init(i915);
@@ -18551,6 +18554,9 @@
 
        intel_bw_cleanup(i915);
 
+       DRM_DESTROY_WAITQUEUE(&i915->atomic_commit_wq);
+       spin_lock_destroy(&i915->atomic_commit_lock);
+
        destroy_workqueue(i915->flip_wq);
        destroy_workqueue(i915->modeset_wq);