Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:17:30 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/include/linux: dma-mapping.h mutex.h sched.h
spinlock.h
Log Message:
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 <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/include/linux/dma-mapping.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/linux/mutex.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/sched.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/include/linux/spinlock.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/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.14 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.15
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.14 Mon Aug 27 04:58:37 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 06:17:30 2018
@@ -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_local_map;
struct drm_device_dma;
struct drm_dma_handle;
struct drm_gem_object;
+struct drm_bus_irq_cookie;
struct device_node;
struct videomode;
Index: src/sys/external/bsd/drm2/include/linux/dma-mapping.h
diff -u src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.3 src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.4
--- src/sys/external/bsd/drm2/include/linux/dma-mapping.h:1.3 Wed Aug 6 13:50:53 2014
+++ src/sys/external/bsd/drm2/include/linux/dma-mapping.h Mon Aug 27 06:17:30 2018
@@ -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
Index: src/sys/external/bsd/drm2/include/linux/mutex.h
diff -u src/sys/external/bsd/drm2/include/linux/mutex.h:1.8 src/sys/external/bsd/drm2/include/linux/mutex.h:1.9
--- src/sys/external/bsd/drm2/include/linux/mutex.h:1.8 Mon Aug 27 06:06:41 2018
+++ src/sys/external/bsd/drm2/include/linux/mutex.h Mon Aug 27 06:17:30 2018
@@ -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;
Index: src/sys/external/bsd/drm2/include/linux/sched.h
diff -u src/sys/external/bsd/drm2/include/linux/sched.h:1.6 src/sys/external/bsd/drm2/include/linux/sched.h:1.7
--- src/sys/external/bsd/drm2/include/linux/sched.h:1.6 Mon Aug 27 06:07:32 2018
+++ src/sys/external/bsd/drm2/include/linux/sched.h Mon Aug 27 06:17:30 2018
@@ -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
Index: src/sys/external/bsd/drm2/include/linux/spinlock.h
diff -u src/sys/external/bsd/drm2/include/linux/spinlock.h:1.7 src/sys/external/bsd/drm2/include/linux/spinlock.h:1.8
--- src/sys/external/bsd/drm2/include/linux/spinlock.h:1.7 Wed Apr 13 08:43:56 2016
+++ src/sys/external/bsd/drm2/include/linux/spinlock.h Mon Aug 27 06:17:30 2018
@@ -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 */
