[src/trunk]: src/sys/external/bsd/drm2 Just use `drm' for DRM/UMS PCI attachm...

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

details:   https://anonhg.NetBSD.org/src/rev/859ca755d1ab
branches:  trunk
changeset: 807964:859ca755d1ab
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Apr 29 11:28:32 2015 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/pci/files.drmkms_pci |  11 ++++-------
 sys/external/bsd/drm2/via/files.via        |   7 ++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r 93c53d5fc669 -r 859ca755d1ab sys/external/bsd/drm2/pci/files.drmkms_pci
--- a/sys/external/bsd/drm2/pci/files.drmkms_pci        Wed Apr 29 11:25:36 2015 +0000
+++ b/sys/external/bsd/drm2/pci/files.drmkms_pci        Wed Apr 29 11:28:32 2015 +0000
@@ -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"
 
diff -r 93c53d5fc669 -r 859ca755d1ab sys/external/bsd/drm2/via/files.via
--- a/sys/external/bsd/drm2/via/files.via       Wed Apr 29 11:25:36 2015 +0000
+++ b/sys/external/bsd/drm2/via/files.via       Wed Apr 29 11:28:32 2015 +0000
@@ -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_video.c              viadrmums
 
 file   external/bsd/drm2/via/via_pci.c                         viadrmums
+file   external/bsd/drm2/via/via_module.c                      viadrmums