Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:44:33 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_module.c
src/sys/modules/drm2 [riastradh-drm2]: Makefile
Log Message:
Hook pci code back into drm2 module.
Comment that drm_pci.c and drm_agpsupport.c should properly be put
into a separate drm2pci module eventually.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/sys/modules/drm2/Makefile
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_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.1 src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.2
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.1 Wed Jul 24 02:43:09 2013
+++ src/sys/external/bsd/drm2/drm/drm_module.c Wed Jul 24 02:44:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.1.2.1 2013/07/24 02:43:09 riastradh Exp $ */
+/* $NetBSD: drm_module.c,v 1.1.2.2 2013/07/24 02:44:33 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,14 +30,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.1.2.1 2013/07/24 02:43:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.1.2.2 2013/07/24 02:44:33 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
#include <sys/module.h>
#include <sys/systm.h>
-MODULE(MODULE_CLASS_MISC, drm, NULL);
+MODULE(MODULE_CLASS_MISC, drm, "pci");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/modules/drm2/Makefile
diff -u src/sys/modules/drm2/Makefile:1.1.2.26 src/sys/modules/drm2/Makefile:1.1.2.27
--- src/sys/modules/drm2/Makefile:1.1.2.26 Wed Jul 24 02:43:26 2013
+++ src/sys/modules/drm2/Makefile Wed Jul 24 02:44:33 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.2.26 2013/07/24 02:43:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.27 2013/07/24 02:44:33 riastradh Exp $
.include "../Makefile.inc"
.include "Makefile.inc"
.PATH: ${S}/external/bsd/drm2/drm
+.PATH: ${S}/external/bsd/drm2/pci
.PATH: ${S}/external/bsd/drm2/linux
.PATH: ${S}/external/bsd/drm2/dist/drm
@@ -11,7 +12,7 @@ KMOD= drm2
IOCONF= drm.ioconf
#SRCS+= ati_pcigart.c # XXX Restore for ATI support.
-SRCS+= drm_agpsupport.c
+SRCS+= drm_agpsupport.c # XXX Move to drm2pci module later.
SRCS+= drm_auth.c
SRCS+= drm_buffer.c
SRCS+= drm_bufs.c
@@ -37,7 +38,7 @@ SRCS+= drm_lock.c
SRCS+= drm_memory.c
SRCS+= drm_mm.c
#SRCS+= drm_modes.c # XXX Rewrite if necessary.
-#SRCS+= drm_pci.c # XXX Move to drm2pci module.
+SRCS+= drm_pci.c # XXX Move to drm2pci module later.
#SRCS+= drm_platform.c # XXX Rewrite per platform.
#SRCS+= drm_prime.c # XXX Revisit later.
#SRCS+= drm_proc.c # XXX Rewrite for sysctl.
