Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:11:11 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_perf_types.h
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_display_types.h
Log Message:
Use types we have.
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h
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/i915/i915_perf_types.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h:1.3 Sun Dec 19 01:24:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_perf_types.h Sun Dec 19 11:11:11 2021
@@ -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 @@ struct i915_perf_stream {
* @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.
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h:1.2 Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_display_types.h Sun Dec 19 11:11:11 2021
@@ -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 <[email protected]>
@@ -387,7 +387,11 @@ struct intel_hdcp {
* 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;
