Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/riastradh-drm2]: src/sys Hook pci code back into drm2 module.
details: https://anonhg.NetBSD.org/src/rev/a0daf39cfdb7
branches: riastradh-drm2
changeset: 788212:a0daf39cfdb7
user: riastradh <riastradh%NetBSD.org@localhost>
date: Wed Jul 24 02:44:33 2013 +0000
description:
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.
diffstat:
sys/external/bsd/drm2/drm/drm_module.c | 6 +++---
sys/modules/drm2/Makefile | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diffs (59 lines):
diff -r 09e6af7edbd0 -r a0daf39cfdb7 sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c Wed Jul 24 02:44:20 2013 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c Wed Jul 24 02:44:33 2013 +0000
@@ -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"
diff -r 09e6af7edbd0 -r a0daf39cfdb7 sys/modules/drm2/Makefile
--- a/sys/modules/drm2/Makefile Wed Jul 24 02:44:20 2013 +0000
+++ b/sys/modules/drm2/Makefile Wed Jul 24 02:44:33 2013 +0000
@@ -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 @@
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_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.
Home |
Main Index |
Thread Index |
Old Index