Commit 7f506847 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Dave Airlie
Browse files

drm: remove i830 driver 



This driver is one of the last users of the big kernel
lock, which is going away. All the hardware supported
by this driver also works with the newer i915 driver,
and recent X.org releases only work with that driver
anyway.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8dbdea84

drivers/gpu/drm/Kconfig

+17 −26
Original line number Diff line number Diff line
@@ -80,25 +80,10 @@ config DRM_I810 
	  selected, the module will be called i810.  AGP support is required

	  for this driver to work.



choice

	prompt "Intel 830M, 845G, 852GM, 855GM, 865G"

	depends on DRM && AGP && AGP_INTEL

	optional



config DRM_I830

	tristate "i830 driver"

	# BKL usage in order to avoid AB-BA deadlocks, i830 may get removed

	depends on BKL

	help

	  Choose this option if you have a system that has Intel 830M, 845G,

	  852GM, 855GM or 865G integrated graphics.  If M is selected, the

	  module will be called i830.  AGP support is required for this driver

	  to work. This driver is used by the older X releases X.org 6.7 and

	  XFree86 4.3. If unsure, build this and i915 as modules and the X server

	  will load the correct one.



config DRM_I915

	tristate "i915 driver"

	tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"

	depends on DRM

	depends on AGP

	depends on AGP_INTEL

	# we need shmfs for the swappable backing store, and in particular

	# the shmem_readpage() which depends upon tmpfs
@@ -115,12 +100,20 @@ config DRM_I915 
	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

	help

	  Choose this option if you have a system that has Intel 830M, 845G,

	  852GM, 855GM 865G or 915G integrated graphics.  If M is selected, the

	  module will be called i915.  AGP support is required for this driver

	  to work. This driver is used by the Intel driver in X.org 6.8 and

	  XFree86 4.4 and above. If unsure, build this and i830 as modules and

	  the X server will load the correct one.

	  Choose this option if you have a system that has "Intel Graphics

	  Media Accelerator" or "HD Graphics" integrated graphics,

	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,

	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,

	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.

	  If M is selected, the module will be called i915.  AGP support

	  is required for this driver to work. This driver is used by

	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It

	  replaces the older i830 module that supported a subset of the

	  hardware in older X.org releases.



	  Note that the older i810/i815 chipsets require the use of the

	  i810 driver instead, and the Atom z5xx series has an entirely

	  different implementation.



config DRM_I915_KMS

	bool "Enable modesetting on intel by default"
@@ -132,8 +125,6 @@ config DRM_I915_KMS 
	  the driver to bind to PCI devices, which precludes loading things

	  like intelfb.



endchoice



config DRM_MGA

	tristate "Matrox g200/g400"

	depends on DRM && PCI

drivers/gpu/drm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ obj-$(CONFIG_DRM_R128) += r128/ 
obj-$(CONFIG_DRM_RADEON)+= radeon/

obj-$(CONFIG_DRM_MGA)	+= mga/

obj-$(CONFIG_DRM_I810)	+= i810/

obj-$(CONFIG_DRM_I830)	+= i830/

obj-$(CONFIG_DRM_I915)  += i915/

obj-$(CONFIG_DRM_SIS)   += sis/

obj-$(CONFIG_DRM_SAVAGE)+= savage/

drivers/gpu/drm/i830/Makefile

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#

# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



ccflags-y := -Iinclude/drm

i830-y := i830_drv.o i830_dma.o i830_irq.o



obj-$(CONFIG_DRM_I830) += i830.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE