Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:17:52 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_modeset_lock.h
src/sys/external/bsd/drm2/drm: drm_drv.c
Log Message:
directly include asm/bug.h for WARN_ON instead of fighting
to match side-loading.
include drm_legacy.h as needed
Author: coypu <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/drm/drm_drv.c
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_modeset_lock.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.2 src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.3
--- src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h:1.2 Mon Aug 27 04:58:38 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_modeset_lock.h Mon Aug 27 06:17:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_modeset_lock.h,v 1.2 2018/08/27 04:58:38 riastradh Exp $ */
+/* $NetBSD: drm_modeset_lock.h,v 1.3 2018/08/27 06:17:52 riastradh Exp $ */
/*
* Copyright (C) 2014 Red Hat
@@ -27,6 +27,7 @@
#define DRM_MODESET_LOCK_H_
#include <linux/ww_mutex.h>
+#include <asm/bug.h>
struct drm_modeset_lock;
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.20 src/sys/external/bsd/drm2/drm/drm_drv.c:1.21
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.20 Tue Dec 5 19:13:52 2017
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Mon Aug 27 06:17:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.20 2017/12/05 19:13:52 jmcneill Exp $ */
+/* $NetBSD: drm_drv.c,v 1.21 2018/08/27 06:17:52 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.20 2017/12/05 19:13:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.21 2018/08/27 06:17:52 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -58,6 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v
#include <linux/pm.h>
#include <drm/drmP.h>
+#include "../dist/drm/drm_legacy.h"
static dev_type_open(drm_open);
