CVS commit: src/sys/external/bsd/drm2/drm

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 27 06:58:20 UTC 2018

Modified Files:
        src/sys/external/bsd/drm2/drm: drm_memory.c drm_vm.c

Log Message:
Get the legacy drm declarations from drm_legacy.h.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/drm/drm_vm.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/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.11 src/sys/external/bsd/drm2/drm/drm_memory.c:1.12
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.11	Mon Aug 27 06:44:15 2018
+++ src/sys/external/bsd/drm2/drm/drm_memory.c	Mon Aug 27 06:58:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_memory.c,v 1.11 2018/08/27 06:44:15 riastradh Exp $	*/
+/*	$NetBSD: drm_memory.c,v 1.12 2018/08/27 06:58:20 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.11 2018/08/27 06:44:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.12 2018/08/27 06:58:20 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c
 #endif
 
 #include <drm/drmP.h>
+#include <drm/drm_legacy.h>
 
 /*
  * XXX drm_bus_borrow is a horrible kludge!

Index: src/sys/external/bsd/drm2/drm/drm_vm.c
diff -u src/sys/external/bsd/drm2/drm/drm_vm.c:1.7 src/sys/external/bsd/drm2/drm/drm_vm.c:1.8
--- src/sys/external/bsd/drm2/drm/drm_vm.c:1.7	Wed Dec 31 08:55:18 2014
+++ src/sys/external/bsd/drm2/drm/drm_vm.c	Mon Aug 27 06:58:20 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_vm.c,v 1.7 2014/12/31 08:55:18 mrg Exp $	*/
+/*	$NetBSD: drm_vm.c,v 1.8 2018/08/27 06:58:20 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.7 2014/12/31 08:55:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1.8 2018/08/27 06:58:20 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/conf.h>
@@ -39,6 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: drm_vm.c,v 1
 #include <uvm/uvm_device.h>
 
 #include <drm/drmP.h>
+#include <drm/drm_legacy.h>
 
 static paddr_t	drm_mmap_paddr_locked(struct drm_device *, off_t, int);
 static paddr_t	drm_mmap_dma_paddr(struct drm_device *, off_t, int);