[src/trunk]: src/sys/external/bsd/drm2/dist/include drm: Apply the Intel pipe...

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

details:   https://anonhg.NetBSD.org/src/rev/d5bd1bf60589
branches:  trunk
changeset: 1029060:d5bd1bf60589
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Dec 20 12:56:07 2021 +0000

description:
drm: Apply the Intel pipe_drmhack in more places.

See sys/external/bsd/drm2/dist/drm/i915/intel/intel_display.h for
details.  Should reduce ctf type duplication a fair bit, maybe even
enough to get us under the 2^15 type limit.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_vblank.h      |  8 +++++++-
 sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h |  8 +++++++-
 sys/external/bsd/drm2/dist/include/uapi/drm/drm.h        |  7 ++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r b89379fb4a4d -r d5bd1bf60589 sys/external/bsd/drm2/dist/include/drm/drm_vblank.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h       Mon Dec 20 12:50:35 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h       Mon Dec 20 12:56:07 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_vblank.h,v 1.11 2021/12/19 12:05:09 riastradh Exp $        */
+/*     $NetBSD: drm_vblank.h,v 1.12 2021/12/20 12:56:07 riastradh Exp $        */
 
 /*
  * Copyright 2016 Intel Corp.
@@ -26,6 +26,12 @@
 #ifndef _DRM_VBLANK_H_
 #define _DRM_VBLANK_H_
 
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/file.h>
+#define        pipe    pipe_drmhack    /* see intel_display.h */
+#endif
+
 #include <linux/seqlock.h>
 #include <linux/idr.h>
 #include <linux/poll.h>
diff -r b89379fb4a4d -r d5bd1bf60589 sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h
--- a/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h  Mon Dec 20 12:50:35 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h  Mon Dec 20 12:56:07 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_lpe_audio.h,v 1.2 2021/12/18 23:45:46 riastradh Exp $    */
+/*     $NetBSD: intel_lpe_audio.h,v 1.3 2021/12/20 12:56:07 riastradh Exp $    */
 
 /*
  * Copyright © 2016 Intel Corporation
@@ -26,6 +26,12 @@
 #ifndef _INTEL_LPE_AUDIO_H_
 #define _INTEL_LPE_AUDIO_H_
 
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/file.h>
+#define        pipe    pipe_drmhack    /* see intel_display.h */
+#endif
+
 #include <linux/types.h>
 #include <linux/spinlock_types.h>
 
diff -r b89379fb4a4d -r d5bd1bf60589 sys/external/bsd/drm2/dist/include/uapi/drm/drm.h
--- a/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Mon Dec 20 12:50:35 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Mon Dec 20 12:56:07 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm.h,v 1.6 2021/12/19 01:54:43 riastradh Exp $        */
+/*     $NetBSD: drm.h,v 1.7 2021/12/20 12:56:07 riastradh Exp $        */
 
 /**
  * \file drm.h
@@ -61,6 +61,11 @@
 #include <sys/fcntl.h>
 
 #ifdef _KERNEL
+
+#include <sys/types.h>
+#include <sys/file.h>
+#define        pipe    pipe_drmhack    /* see intel_display.h */
+
 #include <linux/types.h>
 #include <asm/ioctl.h>
 #else