Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove viadrm(4), superseded by viadrmums.



details:   https://anonhg.NetBSD.org/src/rev/b496503462cd
branches:  trunk
changeset: 324562:b496503462cd
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Jul 10 17:01:42 2018 +0000

description:
Remove viadrm(4), superseded by viadrmums.

Aside from viadrm using older drm code, it's also dysfunctional right now.
See PR port-i386/53364.

diffstat:

 distrib/sets/lists/man/mi                            |     8 +-
 distrib/sets/lists/modules/md.i386                   |     6 +-
 doc/CHANGES                                          |     3 +-
 share/man/man4/Makefile                              |     3 +-
 share/man/man4/drm.4                                 |     5 +-
 sys/arch/amd64/conf/ALL                              |     5 +-
 sys/arch/amd64/conf/GENERIC                          |     5 +-
 sys/arch/i386/conf/ALL                               |     5 +-
 sys/arch/i386/conf/GENERIC                           |     5 +-
 sys/external/bsd/drm/conf/files.drm                  |    14 +-
 sys/external/bsd/drm/dist/bsd-core/drm_pciids.h      |    13 -
 sys/external/bsd/drm/dist/bsd-core/via/Makefile      |    24 -
 sys/external/bsd/drm/dist/bsd-core/via_dmablit.c     |   794 --------
 sys/external/bsd/drm/dist/bsd-core/via_dmablit.h     |   144 -
 sys/external/bsd/drm/dist/bsd-core/via_drv.c         |   134 -
 sys/external/bsd/drm/dist/scripts/create_lk_drm.sh   |     1 -
 sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh   |     3 +-
 sys/external/bsd/drm/dist/shared-core/drm_pciids.txt |    12 -
 sys/external/bsd/drm/dist/shared-core/via_3d_reg.h   |  1650 ------------------
 sys/external/bsd/drm/dist/shared-core/via_dma.c      |   765 --------
 sys/external/bsd/drm/dist/shared-core/via_drm.h      |   279 ---
 sys/external/bsd/drm/dist/shared-core/via_drv.h      |   158 -
 sys/external/bsd/drm/dist/shared-core/via_ds.c       |   274 --
 sys/external/bsd/drm/dist/shared-core/via_ds.h       |   104 -
 sys/external/bsd/drm/dist/shared-core/via_irq.c      |   392 ----
 sys/external/bsd/drm/dist/shared-core/via_map.c      |   137 -
 sys/external/bsd/drm/dist/shared-core/via_mm.c       |   180 -
 sys/external/bsd/drm/dist/shared-core/via_mm.h       |    40 -
 sys/external/bsd/drm/dist/shared-core/via_verifier.c |  1115 ------------
 sys/external/bsd/drm/dist/shared-core/via_verifier.h |    62 -
 sys/external/bsd/drm/dist/shared-core/via_video.c    |    96 -
 sys/modules/Makefile                                 |     3 +-
 sys/modules/viadrm/Makefile                          |    24 -
 sys/modules/viadrm/viadrm.ioconf                     |     9 -
 34 files changed, 23 insertions(+), 6449 deletions(-)

diffs (truncated from 6789 to 300 lines):

diff -r 2e9b04f0a423 -r b496503462cd distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Jul 10 16:53:16 2018 +0000
+++ b/distrib/sets/lists/man/mi Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1595 2018/06/29 12:34:14 roy Exp $
+# $NetBSD: mi,v 1.1596 2018/07/10 17:01:42 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1959,7 +1959,7 @@
 ./usr/share/man/cat4/verifiedexec.0            man-obsolete            obsolete
 ./usr/share/man/cat4/vga.0                     man-sys-catman          .cat
 ./usr/share/man/cat4/vge.0                     man-sys-catman          .cat
-./usr/share/man/cat4/viadrm.0                  man-sys-catman          .cat
+./usr/share/man/cat4/viadrm.0                  man-obsolete            obsolete
 ./usr/share/man/cat4/viaenv.0                  man-sys-catman          .cat
 ./usr/share/man/cat4/viaide.0                  man-sys-catman          .cat
 ./usr/share/man/cat4/viapm.0                   man-obsolete            obsolete
@@ -5026,7 +5026,7 @@
 ./usr/share/man/html4/veriexec.html            man-sys-htmlman         html
 ./usr/share/man/html4/vga.html                 man-sys-htmlman         html
 ./usr/share/man/html4/vge.html                 man-sys-htmlman         html
-./usr/share/man/html4/viadrm.html              man-sys-htmlman         html
+./usr/share/man/html4/viadrm.html              man-obsolete            obsolete
 ./usr/share/man/html4/viaenv.html              man-sys-htmlman         html
 ./usr/share/man/html4/viaide.html              man-sys-htmlman         html
 ./usr/share/man/html4/video.html               man-sys-htmlman         html
@@ -8021,7 +8021,7 @@
 ./usr/share/man/man4/verifiedexec.4            man-obsolete            obsolete
 ./usr/share/man/man4/vga.4                     man-sys-man             .man
 ./usr/share/man/man4/vge.4                     man-sys-man             .man
-./usr/share/man/man4/viadrm.4                  man-sys-man             .man
+./usr/share/man/man4/viadrm.4                  man-obsolete            obsolete
 ./usr/share/man/man4/viaenv.4                  man-sys-man             .man
 ./usr/share/man/man4/viaide.4                  man-sys-man             .man
 ./usr/share/man/man4/viapm.4                   man-obsolete            obsolete
diff -r 2e9b04f0a423 -r b496503462cd distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Tue Jul 10 16:53:16 2018 +0000
+++ b/distrib/sets/lists/modules/md.i386        Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.78 2018/02/26 07:30:17 pgoyette Exp $
+# $NetBSD: md.i386,v 1.79 2018/07/10 17:01:42 maya Exp $
 #
 # NOTE that there are three sets of files here:
 # @MODULEDIR@, i386-xen, and i386pae-xen
@@ -182,8 +182,8 @@
 ./@MODULEDIR@/ubsec/ubsec.kmod                 base-kernel-modules     kmod
 ./@MODULEDIR@/viac7temp                                base-kernel-modules     kmod
 ./@MODULEDIR@/viac7temp/viac7temp.kmod         base-kernel-modules     kmod
-./@MODULEDIR@/viadrm                           base-kernel-modules     kmod
-./@MODULEDIR@/viadrm/viadrm.kmod               base-kernel-modules     kmod
+./@MODULEDIR@/viadrm                           base-obsolete           obsolete
+./@MODULEDIR@/viadrm/viadrm.kmod               base-obsolete           obsolete
 ./@MODULEDIR@/viadrmums                                base-kernel-modules     kmod
 ./@MODULEDIR@/viadrmums/viadrmums.kmod         base-kernel-modules     kmod
 ./@MODULEDIR@/vmt                              base-kernel-modules     kmod
diff -r 2e9b04f0a423 -r b496503462cd doc/CHANGES
--- a/doc/CHANGES       Tue Jul 10 16:53:16 2018 +0000
+++ b/doc/CHANGES       Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.2406 $>
+# LIST OF CHANGES FROM LAST RELEASE:                   <$Revision: 1.2407 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -169,3 +169,4 @@
                [msaitoh 20180626]
        gcc: add lsan the Leak Sanitizer [christos 20180626]
        aarch64: Add support for SMP. [ryo 20180709]
+       viadrm(4): Removed, superseded by viadrmums. [maya 20180710]
diff -r 2e9b04f0a423 -r b496503462cd share/man/man4/Makefile
--- a/share/man/man4/Makefile   Tue Jul 10 16:53:16 2018 +0000
+++ b/share/man/man4/Makefile   Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.656 2018/06/13 03:28:36 ozaki-r Exp $
+#      $NetBSD: Makefile,v 1.657 2018/07/10 17:01:43 maya Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 MAN=   aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -177,7 +177,6 @@
 MLINKS+=drm.4 savagedrm.4
 MLINKS+=drm.4 sisdrm.4
 MLINKS+=drm.4 tdfxdrm.4
-MLINKS+=drm.4 viadrm.4
 
 MLINKS+=acpiec.4 acpiecdt.4
 MLINKS+=acpivga.4 acpiout.4
diff -r 2e9b04f0a423 -r b496503462cd share/man/man4/drm.4
--- a/share/man/man4/drm.4      Tue Jul 10 16:53:16 2018 +0000
+++ b/share/man/man4/drm.4      Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: drm.4,v 1.15 2013/06/04 07:47:54 wiz Exp $
+.\"    $NetBSD: drm.4,v 1.16 2018/07/10 17:01:43 maya Exp $
 .\"
 .\" Copyright (c) 2007, 2013 Thomas Klausner
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd June 4, 2013
+.Dd July 10, 2018
 .Dt DRM 4
 .Os
 .Sh NAME
@@ -38,7 +38,6 @@
 .Cd savagedrm*     at drm?
 .Cd sisdrm*        at drm?
 .Cd tdfxdrm*       at drm?
-.Cd viadrm*        at drm?
 .Pp
 .Cd options        DRM_DEBUG
 .Cd options        DRM_NO_AGP
diff -r 2e9b04f0a423 -r b496503462cd sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.90 2018/06/16 15:04:29 jdolecek Exp $
+# $NetBSD: ALL,v 1.91 2018/07/10 17:01:43 maya Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.90 $"
+#ident         "ALL-$Revision: 1.91 $"
 
 maxusers       64              # estimated number of users
 
@@ -511,7 +511,6 @@
 #sisdrm*       at drm?         # SiS DRM driver
 #tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
 #vboxdrm*      at drm?         # VirtualBox DRM driver
-#viadrm*       at drm?         # VIA UniChrome DRM driver
 
 # DRMKMS drivers
 i915drmkms*    at pci? dev ? function ?
diff -r 2e9b04f0a423 -r b496503462cd sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.493 2018/06/07 13:36:28 thorpej Exp $
+# $NetBSD: GENERIC,v 1.494 2018/07/10 17:01:43 maya Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.493 $"
+#ident         "GENERIC-$Revision: 1.494 $"
 
 maxusers       64              # estimated number of users
 
@@ -418,7 +418,6 @@
 #savagedrm*    at drm?         # S3 Savage DRM driver
 #sisdrm*       at drm?         # SiS DRM driver
 #tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
-#viadrm*       at drm?         # VIA DRM driver
 
 # DRMKMS drivers
 i915drmkms*    at pci? dev ? function ?
diff -r 2e9b04f0a423 -r b496503462cd sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.440 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: ALL,v 1.441 2018/07/10 17:01:43 maya Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.440 $"
+#ident         "ALL-$Revision: 1.441 $"
 
 maxusers       64              # estimated number of users
 
@@ -595,7 +595,6 @@
 #sisdrm*       at drm?         # SiS DRM driver
 #tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
 #vboxdrm*      at drm?         # VirtualBox DRM driver
-#viadrm*       at drm?         # VIA UniChrome DRM driver
 
 # DRMKMS drivers
 i915drmkms*    at pci? dev ? function ?
diff -r 2e9b04f0a423 -r b496503462cd sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1181 2018/07/10 17:01:43 maya Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1180 $"
+#ident         "GENERIC-$Revision: 1.1181 $"
 
 maxusers       64              # estimated number of users
 
@@ -558,7 +558,6 @@
 #savagedrm*    at drm?         # S3 Savage DRM driver
 #sisdrm*       at drm?         # SiS DRM driver
 #tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
-#viadrm*       at drm?         # VIA DRM driver
 
 # DRMKMS drivers
 i915drmkms*    at pci? dev ? function ?
diff -r 2e9b04f0a423 -r b496503462cd sys/external/bsd/drm/conf/files.drm
--- a/sys/external/bsd/drm/conf/files.drm       Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/external/bsd/drm/conf/files.drm       Tue Jul 10 17:01:42 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drm,v 1.7 2011/03/27 08:45:11 mlelstv Exp $
+#      $NetBSD: files.drm,v 1.8 2018/07/10 17:01:43 maya Exp $
 
 # direct rendering modules
 define drmbase
@@ -117,15 +117,3 @@
 device tdfxdrm: drmbase, drmpci
 attach tdfxdrm at drm
 file   external/bsd/drm/dist/bsd-core/tdfx_drv.c               tdfxdrm
-
-device viadrm: drmbase, drmpci
-attach viadrm at drm
-file   external/bsd/drm/dist/bsd-core/via_drv.c                viadrm
-file   external/bsd/drm/dist/bsd-core/via_dmablit.c            viadrm
-file   external/bsd/drm/dist/shared-core/via_dma.c             viadrm
-file   external/bsd/drm/dist/shared-core/via_ds.c              viadrm
-file   external/bsd/drm/dist/shared-core/via_irq.c             viadrm
-file   external/bsd/drm/dist/shared-core/via_map.c             viadrm
-file   external/bsd/drm/dist/shared-core/via_mm.c              viadrm
-file   external/bsd/drm/dist/shared-core/via_verifier.c        viadrm
-file   external/bsd/drm/dist/shared-core/via_video.c           viadrm
diff -r 2e9b04f0a423 -r b496503462cd sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
--- a/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h   Tue Jul 10 16:53:16 2018 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h   Tue Jul 10 17:01:42 2018 +0000
@@ -500,19 +500,6 @@
        {0x121a, 0x000b, 0, "3dfx Voodoo4 4200"}, \
        {0, 0, 0, NULL}
 
-#define viadrv_PCI_IDS \
-       {0x1106, 0x3022, 0, "VIA CLE266 3022"}, \
-       {0x1106, 0x3118, VIA_PRO_GROUP_A, "VIA CN400 / PM8X0"}, \
-       {0x1106, 0x3122, 0, "VIA CLE266"}, \
-       {0x1106, 0x7205, 0, "VIA KM400"}, \
-       {0x1106, 0x3108, 0, "VIA K8M800"}, \
-       {0x1106, 0x3344, 0, "VIA CN700 / VM800 / P4M800Pro"}, \
-       {0x1106, 0x3343, 0, "VIA P4M890"}, \
-       {0x1106, 0x3230, VIA_DX9_0, "VIA K8M890"}, \
-       {0x1106, 0x3157, VIA_PRO_GROUP_A, "VIA CX700"}, \
-       {0x1106, 0x3371, VIA_DX9_0, "VIA P4M900 / VN896"}, \
-       {0, 0, 0, NULL}
-
 #define i810_PCI_IDS \
        {0x8086, 0x7121, 0, "Intel i810 GMCH"}, \
        {0x8086, 0x7123, 0, "Intel i810-DC100 GMCH"}, \
diff -r 2e9b04f0a423 -r b496503462cd sys/external/bsd/drm/dist/bsd-core/via/Makefile
--- a/sys/external/bsd/drm/dist/bsd-core/via/Makefile   Tue Jul 10 16:53:16 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/..
-KMOD   = via
-NO_MAN = YES
-SRCS    = via_dma.c via_drv.c via_ds.c via_irq.c via_map.c via_mm.c \
-       via_verifier.c via_video.c
-SRCS   += device_if.h bus_if.h pci_if.h opt_drm.h
-CFLAGS += ${DEBUG_FLAGS} -I. -I..
-
-.if defined(DRM_DEBUG)
-DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
-.endif
-
-.if !defined(DRM_NOLINUX)
-DRM_LINUX_OPT= "\#define DRM_LINUX 1"
-.endif
-
-opt_drm.h:
-       touch opt_drm.h
-       echo $(DRM_DEBUG_OPT) >> opt_drm.h
-       echo $(DRM_LINUX_OPT) >> opt_drm.h
-
-.include <bsd.kmod.mk>
diff -r 2e9b04f0a423 -r b496503462cd sys/external/bsd/drm/dist/bsd-core/via_dmablit.c
--- a/sys/external/bsd/drm/dist/bsd-core/via_dmablit.c  Tue Jul 10 16:53:16 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,794 +0,0 @@
-/* via_dmablit.c -- PCI DMA BitBlt support for the VIA Unichrome/Pro
- *
- * Copyright (C) 2005 Thomas Hellstrom, All Rights Reserved.



Home | Main Index | Thread Index | Old Index