[src/trunk]: src/sys/external/bsd/drm2 begin fixing -Werror build:

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

details:   https://anonhg.NetBSD.org/src/rev/58ccec4841f1
branches:  trunk
changeset: 834796:58ccec4841f1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:17:30 2018 +0000

description:
begin fixing -Werror build:

Provide missing declarations from older drm
provide more definitions used by code
no idea what might_lock is, but it might be some error-checking
lockdep thing.


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h     |  3 ++-
 sys/external/bsd/drm2/include/linux/dma-mapping.h |  4 +++-
 sys/external/bsd/drm2/include/linux/mutex.h       |  7 ++++---
 sys/external/bsd/drm2/include/linux/sched.h       |  3 ++-
 sys/external/bsd/drm2/include/linux/spinlock.h    |  4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diffs (91 lines):

diff -r f4b6b6d192ed -r 58ccec4841f1 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 06:17:17 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 06:17:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.14 2018/08/27 04:58:37 riastradh Exp $      */
+/*     $NetBSD: drmP.h,v 1.15 2018/08/27 06:17:30 riastradh Exp $      */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -96,6 +96,7 @@
 struct drm_device_dma;
 struct drm_dma_handle;
 struct drm_gem_object;
+struct drm_bus_irq_cookie;
 
 struct device_node;
 struct videomode;
diff -r f4b6b6d192ed -r 58ccec4841f1 sys/external/bsd/drm2/include/linux/dma-mapping.h
--- a/sys/external/bsd/drm2/include/linux/dma-mapping.h Mon Aug 27 06:17:17 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/dma-mapping.h Mon Aug 27 06:17:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dma-mapping.h,v 1.3 2014/08/06 13:50:53 riastradh Exp $        */
+/*     $NetBSD: dma-mapping.h,v 1.4 2018/08/27 06:17:30 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,8 @@
 
 #include <sys/bus.h>
 
+#include <linux/bug.h>
+
 typedef bus_addr_t dma_addr_t;
 
 static inline uintmax_t
diff -r f4b6b6d192ed -r 58ccec4841f1 sys/external/bsd/drm2/include/linux/mutex.h
--- a/sys/external/bsd/drm2/include/linux/mutex.h       Mon Aug 27 06:17:17 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/mutex.h       Mon Aug 27 06:17:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.8 2018/08/27 06:06:41 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.9 2018/08/27 06:17:30 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,8 +37,9 @@
 #include <lib/libkern/libkern.h> /* KASSERT */
 #include <linux/list.h>
 
-#define        __acquires(lock)        /* XXX lockdep stuff */
-#define        __releases(lock)        /* XXX lockdep stuff */
+#define        __acquires(lock)                        /* XXX lockdep stuff */
+#define        __releases(lock)                        /* XXX lockdep stuff */
+#define might_lock(lock) do {} while(0)        /* XXX lockdep stuff */
 
 struct mutex {
        kmutex_t mtx_lock;
diff -r f4b6b6d192ed -r 58ccec4841f1 sys/external/bsd/drm2/include/linux/sched.h
--- a/sys/external/bsd/drm2/include/linux/sched.h       Mon Aug 27 06:17:17 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/sched.h       Mon Aug 27 06:17:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sched.h,v 1.6 2018/08/27 06:07:32 riastradh Exp $      */
+/*     $NetBSD: sched.h,v 1.7 2018/08/27 06:17:30 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
 #include <sys/proc.h>
 
 #include <asm/param.h>
+#include <asm/barrier.h>
 #include <linux/errno.h>
 
 #define        TASK_COMM_LEN   MAXCOMLEN
diff -r f4b6b6d192ed -r 58ccec4841f1 sys/external/bsd/drm2/include/linux/spinlock.h
--- a/sys/external/bsd/drm2/include/linux/spinlock.h    Mon Aug 27 06:17:17 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/spinlock.h    Mon Aug 27 06:17:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spinlock.h,v 1.7 2016/04/13 08:43:56 riastradh Exp $   */
+/*     $NetBSD: spinlock.h,v 1.8 2018/08/27 06:17:30 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
 #include <sys/mutex.h>
 
 #include <machine/limits.h>
+#include <linux/irqflags.h>
+#include <linux/preempt.h>
 
 #define        __acquires(lock)        /* XXX lockdep stuff */
 #define        __releases(lock)        /* XXX lockdep stuff */