Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/include/linux Revert "Give up on findi...



details:   https://anonhg.NetBSD.org/src/rev/ea2b1ce5ab9e
branches:  trunk
changeset: 1028322:ea2b1ce5ab9e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:38:05 2021 +0000

description:
Revert "Give up on finding how linux side-loads these"

Found it.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h    |  3 +--
 sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h |  3 +--
 sys/external/bsd/drm2/include/linux/device.h           |  3 ++-
 sys/external/bsd/drm2/include/linux/hrtimer.h          |  4 +++-
 sys/external/bsd/drm2/include/linux/sched.h            |  5 ++++-
 sys/external/bsd/drm2/include/linux/timer.h            |  3 ++-
 6 files changed, 13 insertions(+), 8 deletions(-)

diffs (107 lines):

diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h       Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h       Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_mode.h,v 1.7 2021/12/19 10:37:18 riastradh Exp $        */
+/*     $NetBSD: radeon_mode.h,v 1.8 2021/12/19 10:38:05 riastradh Exp $        */
 
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
@@ -41,7 +41,6 @@
 #include <drm/drm_crtc_helper.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <linux/ktime.h>
 
 struct radeon_bo;
 struct radeon_device;
diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h    Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_dp_helper.h    Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_dp_helper.h,v 1.6 2021/12/19 10:37:18 riastradh Exp $      */
+/*     $NetBSD: drm_dp_helper.h,v 1.7 2021/12/19 10:38:05 riastradh Exp $      */
 
 /*
  * Copyright © 2008 Keith Packard
@@ -27,7 +27,6 @@
 
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/seq_file.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/include/linux/device.h
--- a/sys/external/bsd/drm2/include/linux/device.h      Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/device.h      Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: device.h,v 1.11 2021/12/19 10:36:07 riastradh Exp $    */
+/*     $NetBSD: device.h,v 1.12 2021/12/19 10:38:05 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,7 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 
+#include <linux/hrtimer.h>
 #include <linux/ratelimit.h>
 
 #define        dev_crit(DEV, FMT, ...) do {                                          \
diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/include/linux/hrtimer.h
--- a/sys/external/bsd/drm2/include/linux/hrtimer.h     Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/hrtimer.h     Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hrtimer.h,v 1.2 2021/12/19 01:19:07 riastradh Exp $    */
+/*     $NetBSD: hrtimer.h,v 1.3 2021/12/19 10:38:05 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _LINUX_HRTIMER_H_
 #define _LINUX_HRTIMER_H_
 
+#include <linux/timer.h>
+
 struct hrtimer {
 };
 
diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/include/linux/sched.h
--- a/sys/external/bsd/drm2/include/linux/sched.h       Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/sched.h       Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched.h,v 1.17 2021/12/19 01:51:27 riastradh Exp $     */
+/*     $NetBSD: sched.h,v 1.18 2021/12/19 10:38:05 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,8 +40,11 @@
 #include <asm/param.h>
 #include <asm/barrier.h>
 #include <asm/processor.h>
+#include <linux/device.h>
 #include <linux/errno.h>
 
+struct seq_file;
+
 #define        TASK_COMM_LEN   MAXCOMLEN
 
 #define        MAX_SCHEDULE_TIMEOUT    (INT_MAX/2)     /* paranoia */
diff -r 4dff07cf6d4f -r ea2b1ce5ab9e sys/external/bsd/drm2/include/linux/timer.h
--- a/sys/external/bsd/drm2/include/linux/timer.h       Sun Dec 19 10:37:56 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/timer.h       Sun Dec 19 10:38:05 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer.h,v 1.9 2021/12/19 01:55:29 riastradh Exp $      */
+/*     $NetBSD: timer.h,v 1.10 2021/12/19 10:38:05 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -42,6 +42,7 @@
 #include <sys/callout.h>
 
 #include <linux/jiffies.h>
+#include <linux/ktime.h>
 
 struct timer_list {
        struct callout tl_callout;



Home | Main Index | Thread Index | Old Index