Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Feb 2019 19:36:44 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r344297 - in head/sys: conf dev/drm modules modules/drm modules/drm/drm modules/drm/mach64 modules/drm/mga modules/drm/r128 modules/drm/savage modules/drm/sis modules/drm/tdfx modules/d...
Message-ID:  <201902191936.x1JJai3M052883@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Tue Feb 19 19:36:43 2019
New Revision: 344297
URL: https://svnweb.freebsd.org/changeset/base/344297

Log:
  Per discussions on arch@ and elsewhere, retire drm module / drives.
  
  Retire the drm modules / drivers. These are now handled by the
  drm-legacy-kmod port and/or the drm-kmod port. All future
  development and maintanace will be handled there.
  
  Approved by: graphics team
  Reviewed by: manu@, mmel@
  Differential Revision: https://reviews.freebsd.org/D19196

Deleted:
  head/sys/dev/drm/ati_pcigart.c
  head/sys/dev/drm/drm.h
  head/sys/dev/drm/drmP.h
  head/sys/dev/drm/drm_agpsupport.c
  head/sys/dev/drm/drm_atomic.h
  head/sys/dev/drm/drm_auth.c
  head/sys/dev/drm/drm_bufs.c
  head/sys/dev/drm/drm_context.c
  head/sys/dev/drm/drm_dma.c
  head/sys/dev/drm/drm_drawable.c
  head/sys/dev/drm/drm_drv.c
  head/sys/dev/drm/drm_fops.c
  head/sys/dev/drm/drm_hashtab.c
  head/sys/dev/drm/drm_hashtab.h
  head/sys/dev/drm/drm_internal.h
  head/sys/dev/drm/drm_ioctl.c
  head/sys/dev/drm/drm_irq.c
  head/sys/dev/drm/drm_linux_list.h
  head/sys/dev/drm/drm_lock.c
  head/sys/dev/drm/drm_memory.c
  head/sys/dev/drm/drm_mm.c
  head/sys/dev/drm/drm_mm.h
  head/sys/dev/drm/drm_pci.c
  head/sys/dev/drm/drm_pciids.h
  head/sys/dev/drm/drm_sarea.h
  head/sys/dev/drm/drm_scatter.c
  head/sys/dev/drm/drm_sman.c
  head/sys/dev/drm/drm_sman.h
  head/sys/dev/drm/drm_sysctl.c
  head/sys/dev/drm/drm_vm.c
  head/sys/dev/drm/mach64_dma.c
  head/sys/dev/drm/mach64_drm.h
  head/sys/dev/drm/mach64_drv.c
  head/sys/dev/drm/mach64_drv.h
  head/sys/dev/drm/mach64_irq.c
  head/sys/dev/drm/mach64_state.c
  head/sys/dev/drm/mga_dma.c
  head/sys/dev/drm/mga_drm.h
  head/sys/dev/drm/mga_drv.c
  head/sys/dev/drm/mga_drv.h
  head/sys/dev/drm/mga_irq.c
  head/sys/dev/drm/mga_state.c
  head/sys/dev/drm/mga_ucode.h
  head/sys/dev/drm/mga_warp.c
  head/sys/dev/drm/r128_cce.c
  head/sys/dev/drm/r128_drm.h
  head/sys/dev/drm/r128_drv.c
  head/sys/dev/drm/r128_drv.h
  head/sys/dev/drm/r128_irq.c
  head/sys/dev/drm/r128_state.c
  head/sys/dev/drm/savage_bci.c
  head/sys/dev/drm/savage_drm.h
  head/sys/dev/drm/savage_drv.c
  head/sys/dev/drm/savage_drv.h
  head/sys/dev/drm/savage_state.c
  head/sys/dev/drm/sis_drm.h
  head/sys/dev/drm/sis_drv.c
  head/sys/dev/drm/sis_drv.h
  head/sys/dev/drm/sis_ds.c
  head/sys/dev/drm/sis_ds.h
  head/sys/dev/drm/sis_mm.c
  head/sys/dev/drm/tdfx_drv.c
  head/sys/dev/drm/tdfx_drv.h
  head/sys/dev/drm/via_3d_reg.h
  head/sys/dev/drm/via_dma.c
  head/sys/dev/drm/via_dmablit.c
  head/sys/dev/drm/via_dmablit.h
  head/sys/dev/drm/via_drm.h
  head/sys/dev/drm/via_drv.c
  head/sys/dev/drm/via_drv.h
  head/sys/dev/drm/via_irq.c
  head/sys/dev/drm/via_map.c
  head/sys/dev/drm/via_mm.c
  head/sys/dev/drm/via_verifier.c
  head/sys/dev/drm/via_verifier.h
  head/sys/dev/drm/via_video.c
  head/sys/modules/drm/Makefile
  head/sys/modules/drm/Makefile.inc
  head/sys/modules/drm/drm/Makefile
  head/sys/modules/drm/mach64/Makefile
  head/sys/modules/drm/mga/Makefile
  head/sys/modules/drm/r128/Makefile
  head/sys/modules/drm/savage/Makefile
  head/sys/modules/drm/sis/Makefile
  head/sys/modules/drm/tdfx/Makefile
  head/sys/modules/drm/via/Makefile
Modified:
  head/sys/conf/files
  head/sys/conf/kern.opts.mk
  head/sys/modules/Makefile

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Feb 19 19:17:20 2019	(r344296)
+++ head/sys/conf/files	Tue Feb 19 19:36:43 2019	(r344297)
@@ -1541,55 +1541,6 @@ dev/dcons/dcons_crom.c		optional dcons_crom
 dev/dcons/dcons_os.c		optional dcons
 dev/de/if_de.c			optional de pci
 dev/dme/if_dme.c		optional dme
-dev/drm/ati_pcigart.c		optional drm
-dev/drm/drm_agpsupport.c	optional drm
-dev/drm/drm_auth.c		optional drm
-dev/drm/drm_bufs.c		optional drm
-dev/drm/drm_context.c		optional drm
-dev/drm/drm_dma.c		optional drm
-dev/drm/drm_drawable.c		optional drm
-dev/drm/drm_drv.c		optional drm
-dev/drm/drm_fops.c		optional drm
-dev/drm/drm_hashtab.c		optional drm
-dev/drm/drm_ioctl.c		optional drm
-dev/drm/drm_irq.c		optional drm
-dev/drm/drm_lock.c		optional drm
-dev/drm/drm_memory.c		optional drm
-dev/drm/drm_mm.c		optional drm
-dev/drm/drm_pci.c		optional drm
-dev/drm/drm_scatter.c		optional drm
-dev/drm/drm_sman.c		optional drm
-dev/drm/drm_sysctl.c		optional drm
-dev/drm/drm_vm.c		optional drm
-dev/drm/mach64_dma.c		optional mach64drm
-dev/drm/mach64_drv.c		optional mach64drm
-dev/drm/mach64_irq.c		optional mach64drm
-dev/drm/mach64_state.c		optional mach64drm
-dev/drm/mga_dma.c		optional mgadrm
-dev/drm/mga_drv.c		optional mgadrm
-dev/drm/mga_irq.c		optional mgadrm
-dev/drm/mga_state.c		optional mgadrm
-dev/drm/mga_warp.c		optional mgadrm
-dev/drm/r128_cce.c		optional r128drm \
-	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
-dev/drm/r128_drv.c		optional r128drm
-dev/drm/r128_irq.c		optional r128drm
-dev/drm/r128_state.c		optional r128drm
-dev/drm/savage_bci.c		optional savagedrm
-dev/drm/savage_drv.c		optional savagedrm
-dev/drm/savage_state.c		optional savagedrm
-dev/drm/sis_drv.c		optional sisdrm
-dev/drm/sis_ds.c		optional sisdrm
-dev/drm/sis_mm.c		optional sisdrm
-dev/drm/tdfx_drv.c		optional tdfxdrm
-dev/drm/via_dma.c		optional viadrm
-dev/drm/via_dmablit.c		optional viadrm
-dev/drm/via_drv.c		optional viadrm
-dev/drm/via_irq.c		optional viadrm
-dev/drm/via_map.c		optional viadrm
-dev/drm/via_mm.c		optional viadrm
-dev/drm/via_verifier.c		optional viadrm
-dev/drm/via_video.c		optional viadrm
 dev/drm2/drm_agpsupport.c	optional drm2
 dev/drm2/drm_auth.c		optional drm2
 dev/drm2/drm_bufs.c		optional drm2

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Tue Feb 19 19:17:20 2019	(r344296)
+++ head/sys/conf/kern.opts.mk	Tue Feb 19 19:36:43 2019	(r344297)
@@ -50,7 +50,6 @@ __DEFAULT_YES_OPTIONS = \
 __DEFAULT_NO_OPTIONS = \
     EXTRA_TCP_STACKS \
     KERNEL_RETPOLINE \
-    MODULE_DRM \
     MODULE_DRM2 \
     NAND \
     OFED \

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Tue Feb 19 19:17:20 2019	(r344296)
+++ head/sys/modules/Makefile	Tue Feb 19 19:36:43 2019	(r344297)
@@ -109,7 +109,6 @@ SUBDIR=	\
 	dcons_crom \
 	de \
 	${_dpms} \
-	${_drm} \
 	${_drm2} \
 	dummynet \
 	${_ed} \
@@ -582,9 +581,6 @@ _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
 _dpms=		dpms
-.if ${MK_MODULE_DRM} != "no"
-_drm=		drm
-.endif
 .if ${MK_MODULE_DRM2} != "no"
 _drm2=		drm2
 .endif
@@ -776,9 +772,6 @@ _cardbus=	cardbus
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
-.if ${MK_MODULE_DRM} != "no"
-_drm=		drm
-.endif
 _exca=		exca
 _ffec=		ffec
 _nvd=		nvd



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902191936.x1JJai3M052883>