Skip to contentSkip to conversation

drm: Remove some obsolete drivers(tdfx, mga, i810, savage, r128, sis)

PATCH Superseded Cai Huoqing 1 participant 1 message Dec 2, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm: Remove some obsolete drivers(tdfx, mga, i810, savage, r128, sis)

Commit 399516ab0fee ("MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers")
marked these drivers obsolete 7 years ago.
And the mesa UMD of these drm drivers already in deprecated list in the link: https://docs.mesa3d.org/systems.html

3dfx Glide-->driver/gpu/drm/tdfx
Matrox-->driver/gpu/drm/mga
Intel i810-->driver/gpu/drm/i810
S3 Savage-->drivers/gpu/drm/savage/
ATI Rage 128->drivers/gpu/drm/r128/
Silicon Integrated Systems->drivers/gpu/drm/sis/

It's time to remove these.

---
 drivers/gpu/drm/Kconfig               |   50 -
 drivers/gpu/drm/Makefile              |    6 -
 drivers/gpu/drm/i810/Makefile         |    8 -
 drivers/gpu/drm/i810/i810_dma.c       | 1266 -------------------
 drivers/gpu/drm/i810/i810_drv.c       |  101 --
 drivers/gpu/drm/i810/i810_drv.h       |  246 ----
 drivers/gpu/drm/mga/Makefile          |   11 -
 drivers/gpu/drm/mga/mga_dma.c         | 1168 ------------------
 drivers/gpu/drm/mga/mga_drv.c         |  104 --
 drivers/gpu/drm/mga/mga_drv.h         |  685 -----------
 drivers/gpu/drm/mga/mga_ioc32.c       |  197 ---
 drivers/gpu/drm/mga/mga_irq.c         |  169 ---
 drivers/gpu/drm/mga/mga_state.c       | 1099 -----------------
 drivers/gpu/drm/mga/mga_warp.c        |  167 ---
 drivers/gpu/drm/r128/Makefile         |   10 -
 drivers/gpu/drm/r128/ati_pcigart.c    |  228 ----
 drivers/gpu/drm/r128/ati_pcigart.h    |   31 -
 drivers/gpu/drm/r128/r128_cce.c       |  944 --------------
 drivers/gpu/drm/r128/r128_drv.c       |  116 --
 drivers/gpu/drm/r128/r128_drv.h       |  544 --------
 drivers/gpu/drm/r128/r128_ioc32.c     |  199 ---
 drivers/gpu/drm/r128/r128_irq.c       |  118 --
 drivers/gpu/drm/r128/r128_state.c     | 1641 -------------------------
 drivers/gpu/drm/savage/Makefile       |    9 -
 drivers/gpu/drm/savage/savage_bci.c   | 1082 ----------------
 drivers/gpu/drm/savage/savage_drv.c   |   91 --
 drivers/gpu/drm/savage/savage_drv.h   |  580 ---------
 drivers/gpu/drm/savage/savage_state.c | 1169 ------------------
 drivers/gpu/drm/sis/Makefile          |   10 -
 drivers/gpu/drm/sis/sis_drv.c         |  143 ---
 drivers/gpu/drm/sis/sis_drv.h         |   80 --
 drivers/gpu/drm/sis/sis_mm.c          |  363 ------
 drivers/gpu/drm/tdfx/Makefile         |    8 -
 drivers/gpu/drm/tdfx/tdfx_drv.c       |   90 --
 drivers/gpu/drm/tdfx/tdfx_drv.h       |   47 -
 35 files changed, 12780 deletions(-)
 delete mode 100644 drivers/gpu/drm/i810/Makefile
 delete mode 100644 drivers/gpu/drm/i810/i810_dma.c
 delete mode 100644 drivers/gpu/drm/i810/i810_drv.c
 delete mode 100644 drivers/gpu/drm/i810/i810_drv.h
 delete mode 100644 drivers/gpu/drm/mga/Makefile
 delete mode 100644 drivers/gpu/drm/mga/mga_dma.c
 delete mode 100644 drivers/gpu/drm/mga/mga_drv.c
 delete mode 100644 drivers/gpu/drm/mga/mga_drv.h
 delete mode 100644 drivers/gpu/drm/mga/mga_ioc32.c
 delete mode 100644 drivers/gpu/drm/mga/mga_irq.c
 delete mode 100644 drivers/gpu/drm/mga/mga_state.c
 delete mode 100644 drivers/gpu/drm/mga/mga_warp.c
 delete mode 100644 drivers/gpu/drm/r128/Makefile
 delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.c
 delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.h
 delete mode 100644 drivers/gpu/drm/r128/r128_cce.c
 delete mode 100644 drivers/gpu/drm/r128/r128_drv.c
 delete mode 100644 drivers/gpu/drm/r128/r128_drv.h
 delete mode 100644 drivers/gpu/drm/r128/r128_ioc32.c
 delete mode 100644 drivers/gpu/drm/r128/r128_irq.c
 delete mode 100644 drivers/gpu/drm/r128/r128_state.c
 delete mode 100644 drivers/gpu/drm/savage/Makefile
 delete mode 100644 drivers/gpu/drm/savage/savage_bci.c
 delete mode 100644 drivers/gpu/drm/savage/savage_drv.c
 delete mode 100644 drivers/gpu/drm/savage/savage_drv.h
 delete mode 100644 drivers/gpu/drm/savage/savage_state.c
 delete mode 100644 drivers/gpu/drm/sis/Makefile
 delete mode 100644 drivers/gpu/drm/sis/sis_drv.c
 delete mode 100644 drivers/gpu/drm/sis/sis_drv.h
 delete mode 100644 drivers/gpu/drm/sis/sis_mm.c
 delete mode 100644 drivers/gpu/drm/tdfx/Makefile
 delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.c
 delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.h
drivers/gpu/drm/Kconfig +0 -50
index 315cbdf61979..a70a87798894 100644
@@ -392,49 +392,6 @@ menuconfig DRM_LEGACY
 
 if DRM_LEGACY
 
-config DRM_TDFX
-	tristate "3dfx Banshee/Voodoo3+"
-	depends on DRM && PCI
-	help
-	  Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
-	  graphics card.  If M is selected, the module will be called tdfx.
-
-config DRM_R128
-	tristate "ATI Rage 128"
-	depends on DRM && PCI
-	select FW_LOADER
-	help
-	  Choose this option if you have an ATI Rage 128 graphics card.  If M
-	  is selected, the module will be called r128.  AGP support for
-	  this card is strongly suggested (unless you have a PCI version).
-
-config DRM_I810
-	tristate "Intel I810"
-	# !PREEMPTION because of missing ioctl locking
-	depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN)
-	help
-	  Choose this option if you have an Intel I810 graphics card.  If M is
-	  selected, the module will be called i810.  AGP support is required
-	  for this driver to work.
-
-config DRM_MGA
-	tristate "Matrox g200/g400"
-	depends on DRM && PCI
-	select FW_LOADER
-	help
-	  Choose this option if you have a Matrox G200, G400 or G450 graphics
-	  card.  If M is selected, the module will be called mga.  AGP
-	  support is required for this driver to work.
-
-config DRM_SIS
-	tristate "SiS video cards"
-	depends on DRM && AGP
-	depends on FB_SIS || FB_SIS=n
-	help
-	  Choose this option if you have a SiS 630 or compatible video
-	  chipset. If M is selected the module will be called sis. AGP
-	  support is required for this driver to work.
-
 config DRM_VIA
 	tristate "Via unichrome video cards"
 	depends on DRM && PCI
@@ -442,13 +399,6 @@ config DRM_VIA
 	  Choose this option if you have a Via unichrome or compatible video
 	  chipset. If M is selected the module will be called via.
 
-config DRM_SAVAGE
-	tristate "Savage video cards"
-	depends on DRM && PCI
-	help
-	  Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
-	  chipset. If M is selected the module will be called savage.
-
 endif # DRM_LEGACY
 
 config DRM_EXPORT_FOR_TESTS
drivers/gpu/drm/Makefile +0 -6
index cc637343d87b..489fadf19507 100644
@@ -134,19 +134,13 @@ obj-y			+= arm/
 obj-y			+= display/
 obj-$(CONFIG_DRM_TTM)	+= ttm/
 obj-$(CONFIG_DRM_SCHED)	+= scheduler/
-obj-$(CONFIG_DRM_TDFX)	+= tdfx/
-obj-$(CONFIG_DRM_R128)	+= r128/
 obj-$(CONFIG_DRM_RADEON)+= radeon/
 obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/
-obj-$(CONFIG_DRM_MGA)	+= mga/
-obj-$(CONFIG_DRM_I810)	+= i810/
 obj-$(CONFIG_DRM_I915)	+= i915/
 obj-$(CONFIG_DRM_KMB_DISPLAY)  += kmb/
 obj-$(CONFIG_DRM_MGAG200) += mgag200/
 obj-$(CONFIG_DRM_V3D)  += v3d/
 obj-$(CONFIG_DRM_VC4)  += vc4/
-obj-$(CONFIG_DRM_SIS)   += sis/
-obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
 obj-$(CONFIG_DRM_VIA)	+=via/
 obj-$(CONFIG_DRM_VGEM)	+= vgem/
drivers/gpu/drm/i810/Makefile deleted +0 -8
deleted file mode 100644
index c181f8528c5c..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the drm device driver.  This driver provides support for the
-# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
-
-i810-y := i810_drv.o i810_dma.o
-
-obj-$(CONFIG_DRM_I810)	+= i810.o
drivers/gpu/drm/i810/i810_dma.c deleted +0 -1266

1,266 lines not on this page · raw message

drivers/gpu/drm/i810/i810_drv.c deleted +0 -101

101 lines not on this page · raw message

drivers/gpu/drm/i810/i810_drv.h deleted +0 -246

246 lines not on this page · raw message

drivers/gpu/drm/mga/Makefile deleted +0 -11
deleted file mode 100644
index db07c7fcc996..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the drm device driver.  This driver provides support for the
-# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
-
-mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
-
-mga-$(CONFIG_COMPAT) += mga_ioc32.o
-
-obj-$(CONFIG_DRM_MGA)	+= mga.o
-
drivers/gpu/drm/mga/mga_dma.c deleted +0 -1168

1,168 lines not on this page · raw message

drivers/gpu/drm/mga/mga_drv.c deleted +0 -104

104 lines not on this page · raw message

drivers/gpu/drm/mga/mga_drv.h deleted +0 -685

15 lines not on this page · raw message

drivers/gpu/drm/mga/mga_ioc32.c deleted +0 -197

197 lines not on this page · raw message

drivers/gpu/drm/mga/mga_irq.c deleted +0 -169

169 lines not on this page · raw message

drivers/gpu/drm/mga/mga_state.c deleted +0 -1099

1,099 lines not on this page · raw message

drivers/gpu/drm/mga/mga_warp.c deleted +0 -167

167 lines not on this page · raw message

drivers/gpu/drm/r128/Makefile deleted +0 -10
deleted file mode 100644
index c07a069533ef..000000000000

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/r128/ati_pcigart.c deleted +0 -228

228 lines not on this page · raw message

drivers/gpu/drm/r128/ati_pcigart.h deleted +0 -31
deleted file mode 100644
index a728a1364e66..000000000000

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/r128/r128_cce.c deleted +0 -944

944 lines not on this page · raw message

drivers/gpu/drm/r128/r128_drv.c deleted +0 -116

116 lines not on this page · raw message

drivers/gpu/drm/r128/r128_drv.h deleted +0 -544

544 lines not on this page · raw message

drivers/gpu/drm/r128/r128_ioc32.c deleted +0 -199

199 lines not on this page · raw message

drivers/gpu/drm/r128/r128_irq.c deleted +0 -118

118 lines not on this page · raw message

drivers/gpu/drm/r128/r128_state.c deleted +0 -1641

1,641 lines not on this page · raw message

drivers/gpu/drm/savage/Makefile deleted +0 -9
deleted file mode 100644
index 3e520763d259..000000000000

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/savage/savage_bci.c deleted +0 -1082

1,082 lines not on this page · raw message

drivers/gpu/drm/savage/savage_drv.c deleted +0 -91

91 lines not on this page · raw message

drivers/gpu/drm/savage/savage_drv.h deleted +0 -580

580 lines not on this page · raw message

drivers/gpu/drm/savage/savage_state.c deleted +0 -1169

1,169 lines not on this page · raw message

drivers/gpu/drm/sis/Makefile deleted +0 -10
deleted file mode 100644
index 02b0253fda93..000000000000

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/sis/sis_drv.c deleted +0 -143

143 lines not on this page · raw message

drivers/gpu/drm/sis/sis_drv.h deleted +0 -80

80 lines not on this page · raw message

drivers/gpu/drm/sis/sis_mm.c deleted +0 -363

363 lines not on this page · raw message

drivers/gpu/drm/tdfx/Makefile deleted +0 -8
deleted file mode 100644
index 03b7d0f087b0..000000000000

Lines of this file are not shown. View the raw message.

drivers/gpu/drm/tdfx/tdfx_drv.c deleted +0 -90

90 lines not on this page · raw message

drivers/gpu/drm/tdfx/tdfx_drv.h deleted +0 -47

47 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.