[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Use types we have.

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

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

description:
Use types we have.


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h |  6 +++++-
 sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h             |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 09861ac69433 -r 85b8faf74088 sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h Sun Dec 19 11:11:03 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h Sun Dec 19 11:11:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display_types.h,v 1.2 2021/12/18 23:45:30 riastradh Exp $        */
+/*     $NetBSD: intel_display_types.h,v 1.3 2021/12/19 11:11:11 riastradh Exp $        */
 
 /*
  * Copyright (c) 2006 Dave Airlie <airlied%linux.ie@localhost>
@@ -387,7 +387,11 @@
         * Work queue to signal the CP_IRQ. Used for the waiters to read the
         * available information from HDCP DP sink.
         */
+#ifdef __linux__
        wait_queue_head_t cp_irq_queue;
+#else
+       drm_waitqueue_t cp_irq_queue;
+#endif
        atomic_t cp_irq_count;
        int cp_irq_count_cached;
 
diff -r 09861ac69433 -r 85b8faf74088 sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h     Sun Dec 19 11:11:03 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h     Sun Dec 19 11:11:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_perf_types.h,v 1.3 2021/12/19 01:24:25 riastradh Exp $    */
+/*     $NetBSD: i915_perf_types.h,v 1.4 2021/12/19 11:11:11 riastradh Exp $    */
 
 /* SPDX-License-Identifier: MIT */
 /*
@@ -225,7 +225,11 @@
         * @poll_wq: The wait queue that hrtimer callback wakes when it
         * sees data ready to read in the circular OA buffer.
         */
+#ifdef __linux__
        wait_queue_head_t poll_wq;
+#else
+       drm_waitqueue_t poll_wq;
+#endif
 
        /**
         * @pollin: Whether there is data available to read.