[src/trunk]: src Split out ati_pcigart into a separate module so it can be sh...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc728761d709
branches:  trunk
changeset: 768886:cc728761d709
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 28 15:56:21 2011 +0000

description:
Split out ati_pcigart into a separate module so it can be shared with r128drm

diffstat:

 distrib/sets/lists/modules/md.i386               |   4 +++-
 sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c |  10 ++++++++++
 sys/external/bsd/drm/dist/bsd-core/radeon_drv.c  |   2 +-
 sys/modules/ati_pcigart/Makefile                 |  13 +++++++++++++
 sys/modules/radeondrm/Makefile                   |   4 +---
 5 files changed, 28 insertions(+), 5 deletions(-)

diffs (82 lines):

diff -r 78c9cea0752f -r cc728761d709 distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Sun Aug 28 15:48:19 2011 +0000
+++ b/distrib/sets/lists/modules/md.i386        Sun Aug 28 15:56:21 2011 +0000
@@ -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
diff -r 78c9cea0752f -r cc728761d709 sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c
--- a/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c  Sun Aug 28 15:48:19 2011 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c  Sun Aug 28 15:56:21 2011 +0000
@@ -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;
+}
diff -r 78c9cea0752f -r cc728761d709 sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
--- a/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c   Sun Aug 28 15:48:19 2011 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c   Sun Aug 28 15:56:21 2011 +0000
@@ -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"
diff -r 78c9cea0752f -r cc728761d709 sys/modules/ati_pcigart/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/ati_pcigart/Makefile  Sun Aug 28 15:56:21 2011 +0000
@@ -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>
diff -r 78c9cea0752f -r cc728761d709 sys/modules/radeondrm/Makefile
--- a/sys/modules/radeondrm/Makefile    Sun Aug 28 15:48:19 2011 +0000
+++ b/sys/modules/radeondrm/Makefile    Sun Aug 28 15:56:21 2011 +0000
@@ -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