Module Name: src
Committed By: jmcneill
Date: Sun Aug 28 15:56:22 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.i386
src/sys/external/bsd/drm/dist/bsd-core: ati_pcigart.c radeon_drv.c
src/sys/modules/radeondrm: Makefile
Added Files:
src/sys/modules/ati_pcigart: Makefile
Log Message:
Split out ati_pcigart into a separate module so it can be shared with r128drm
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
cvs rdiff -u -r0 -r1.1 src/sys/modules/ati_pcigart/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/radeondrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.33 src/distrib/sets/lists/modules/md.i386:1.34
--- src/distrib/sets/lists/modules/md.i386:1.33 Thu Aug 11 12:03:58 2011
+++ src/distrib/sets/lists/modules/md.i386 Sun Aug 28 15:56:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.33 2011/08/11 12:03:58 mbalmer Exp $
+# $NetBSD: md.i386,v 1.34 2011/08/28 15:56:21 jmcneill Exp $
./@MODULEDIR@/acpiacad base-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibat base-kernel-modules kmod
@@ -33,6 +33,8 @@
./@MODULEDIR@/aps/aps.kmod base-kernel-modules kmod
./@MODULEDIR@/asus base-kernel-modules kmod
./@MODULEDIR@/asus/asus.kmod base-kernel-modules kmod
+./@MODULEDIR@/ati_pcigart base-kernel-modules kmod
+./@MODULEDIR@/ati_pcigart/ati_pcigart.kmod base-kernel-modules kmod
./@MODULEDIR@/au8522 base-kernel-modules kmod
./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
./@MODULEDIR@/auvitek base-kernel-modules kmod
Index: src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.5 src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.6
--- src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c:1.5 Wed Sep 2 01:34:34 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c Sun Aug 28 15:56:21 2011
@@ -302,3 +302,13 @@
gart_info->bus_addr = bus_address;
return ret;
}
+
+MODULE(MODULE_CLASS_MISC, ati_pcigart, "drm");
+
+static int
+ati_pcigart_modcmd(modcmd_t cmd, void *priv)
+{
+ if (cmd == MODULE_CMD_INIT || cmd == MODULE_CMD_FINI)
+ return 0;
+ return ENOTTY;
+}
Index: src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.11 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.12
--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.11 Sun Aug 28 15:40:50 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c Sun Aug 28 15:56:21 2011
@@ -201,7 +201,7 @@
CFATTACH_DECL_NEW(radeondrm, sizeof(struct drm_device),
radeondrm_probe, radeondrm_attach, radeondrm_detach, NULL);
-MODULE(MODULE_CLASS_DRIVER, radeondrm, "drm");
+MODULE(MODULE_CLASS_DRIVER, radeondrm, "drm,ati_pcigart");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.9 src/sys/modules/radeondrm/Makefile:1.10
--- src/sys/modules/radeondrm/Makefile:1.9 Sun Aug 28 15:40:50 2011
+++ src/sys/modules/radeondrm/Makefile Sun Aug 28 15:56:22 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/28 15:40:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.10 2011/08/28 15:56:22 jmcneill Exp $
.include "../Makefile.inc"
@@ -9,8 +9,6 @@
IOCONF= radeondrm.ioconf
SRCS= radeon_drv.c
-# XXX this one should be in a sub-driver to share with r128drm
-SRCS+= ati_pcigart.c
SRCS+= r300_cmdbuf.c
SRCS+= r600_cp.c
SRCS+= r600_blit.c
Added files:
Index: src/sys/modules/ati_pcigart/Makefile
diff -u /dev/null src/sys/modules/ati_pcigart/Makefile:1.1
--- /dev/null Sun Aug 28 15:56:22 2011
+++ src/sys/modules/ati_pcigart/Makefile Sun Aug 28 15:56:21 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/08/28 15:56:21 jmcneill Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/external/bsd/drm/dist/bsd-core
+
+KMOD= ati_pcigart
+
+SRCS= ati_pcigart.c
+
+CPPFLAGS+= -I${S}/external/bsd/drm/dist/shared-core
+
+.include <bsd.kmodule.mk>
