Module Name: src
Committed By: riastradh
Date: Wed Apr 29 11:28:33 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/pci: files.drmkms_pci
src/sys/external/bsd/drm2/via: files.via
Log Message:
Just use `drm' for DRM/UMS PCI attachments at PCI devices.
It'll make life simpler. No need to distinguish drm from drm2 here
because it's just an interface attribute, no content, and we use it
compatibly: parent provides pci_attach_args.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/pci/files.drmkms_pci
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/via/files.via
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/pci/files.drmkms_pci
diff -u src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.6 src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.7
--- src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.6 Wed Apr 29 04:45:03 2015
+++ src/sys/external/bsd/drm2/pci/files.drmkms_pci Wed Apr 29 11:28:32 2015
@@ -1,14 +1,11 @@
-# $NetBSD: files.drmkms_pci,v 1.6 2015/04/29 04:45:03 riastradh Exp $
+# $NetBSD: files.drmkms_pci,v 1.7 2015/04/29 11:28:32 riastradh Exp $
# Attribute for kernel components supporting PCI-based real graphics
-# drivers, a.k.a. `drmkms' (kernel mode-setting).
+# drivers, a.k.a. `KMS' (kernel mode-setting), as opposed to the legacy
+# `drm' interface attribute, which is where PCI-based fake graphics
+# drivers, a.k.a. `UMS' (user mode-setting), attach.
define drmkms_pci: drmkms
-# Interface attribute for attaching PCI-based fake graphics drivers,
-# a.k.a. `drmums' (user mode-setting). This uses all the same support
-# code as PCI-based KMS drivers but has a bogus attachment via vga(4).
-define drmums_pci {}: drmkms_pci
-
# XXX Not quite right! Should AGP stuff be kept separate?
makeoptions drmkms_pci CPPFLAGS+="-DCONFIG_AGP"
Index: src/sys/external/bsd/drm2/via/files.via
diff -u src/sys/external/bsd/drm2/via/files.via:1.2 src/sys/external/bsd/drm2/via/files.via:1.3
--- src/sys/external/bsd/drm2/via/files.via:1.2 Wed Apr 29 04:45:03 2015
+++ src/sys/external/bsd/drm2/via/files.via Wed Apr 29 11:28:32 2015
@@ -1,7 +1,7 @@
-# $NetBSD: files.via,v 1.2 2015/04/29 04:45:03 riastradh Exp $
+# $NetBSD: files.via,v 1.3 2015/04/29 11:28:32 riastradh Exp $
-device viadrmums
-attach viadrmums at drmums_pci
+device viadrmums: drmkms, drmkms_pci
+attach viadrmums at drm
makeoptions viadrmums CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/via"
makeoptions viadrmums CPPFLAGS+="-I$S/external/bsd/drm2/via"
@@ -19,3 +19,4 @@ file external/bsd/drm2/dist/drm/via/via_
file external/bsd/drm2/dist/drm/via/via_video.c viadrmums
file external/bsd/drm2/via/via_pci.c viadrmums
+file external/bsd/drm2/via/via_module.c viadrmums
