Module Name: src
Committed By: riastradh
Date: Mon Dec 20 12:56:08 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_vblank.h
intel_lpe_audio.h
src/sys/external/bsd/drm2/dist/include/uapi/drm: drm.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.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/include/drm/drm_vblank.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.11 src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.12
--- src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h:1.11 Sun Dec 19 12:05:09 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_vblank.h Mon Dec 20 12:56:07 2021
@@ -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>
Index: src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h:1.3
--- src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h:1.2 Sat Dec 18 23:45:46 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/intel_lpe_audio.h Mon Dec 20 12:56:07 2021
@@ -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>
Index: src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h
diff -u src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.6 src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.7
--- src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h:1.6 Sun Dec 19 01:54:43 2021
+++ src/sys/external/bsd/drm2/dist/include/uapi/drm/drm.h Mon Dec 20 12:56:07 2021
@@ -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 @@ typedef unsigned int drm_handle_t;
#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
