Skip to content

Commit 689237a

Browse files
Thomas Zimmermannhdeller
authored andcommitted
fbdev/intelfb: Remove driver
From looking at the PCI IDs, every device supported by intelfb is also supported by i915. Anyone still using intelfb should please move on to i915, which does everything intelfb does but better. Removing intelfb is motivated by the driver's excessive use of the global screen_info state. The state belongs to architecture and firmware code; device drivers should not attempt to access it. But fixing intelfb would require a significant change in the driver's probing logic. As intelfb has been obsolete for nearly 2 decades, it is probably not worth the effort. Let's just remove it. Also remove the related documentation. Signed-off-by: Thomas Zimmermann <[email protected]> Acked-by: Maik Broemme <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent c25a19a commit 689237a

File tree

12 files changed

+1
-5208
lines changed

12 files changed

+1
-5208
lines changed

Documentation/fb/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Frame Buffer
1919
framebuffer
2020
gxfb
2121
intel810
22-
intelfb
2322
internals
2423
lxfb
2524
matroxfb

Documentation/fb/intelfb.rst

Lines changed: 0 additions & 155 deletions
This file was deleted.

Documentation/userspace-api/ioctl/ioctl-number.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ Code Seq# Include File Comments
128128
'F' all linux/fb.h conflict!
129129
'F' 01-02 drivers/scsi/pmcraid.h conflict!
130130
'F' 20 drivers/video/fsl-diu-fb.h conflict!
131-
'F' 20 drivers/video/intelfb/intelfb.h conflict!
132131
'F' 20 linux/ivtvfb.h conflict!
133132
'F' 20 linux/matroxfb.h conflict!
134133
'F' 20 drivers/video/aty/atyfb_base.c conflict!

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10652,13 +10652,6 @@ S: Supported
1065210652
F: drivers/infiniband/hw/irdma/
1065310653
F: include/uapi/rdma/irdma-abi.h
1065410654

10655-
INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
10656-
M: Maik Broemme <[email protected]>
10657-
10658-
S: Maintained
10659-
F: Documentation/fb/intelfb.rst
10660-
F: drivers/video/fbdev/intelfb/
10661-
1066210655
INTEL GPIO DRIVERS
1066310656
M: Andy Shevchenko <[email protected]>
1066410657

drivers/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@ obj-y += gpu/
7171

7272
obj-$(CONFIG_CONNECTOR) += connector/
7373

74-
# i810fb and intelfb depend on char/agp/
74+
# i810fb depends on char/agp/
7575
obj-$(CONFIG_FB_I810) += video/fbdev/i810/
76-
obj-$(CONFIG_FB_INTEL) += video/fbdev/intelfb/
7776

7877
obj-$(CONFIG_PARPORT) += parport/
7978
obj-y += base/ block/ misc/ mfd/ nfc/

drivers/video/fbdev/Kconfig

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -829,45 +829,6 @@ config FB_I810_I2C
829829

830830
If unsure, say Y.
831831

832-
config FB_INTEL
833-
tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support"
834-
depends on FB && PCI && X86 && AGP_INTEL && EXPERT
835-
select FB_CFB_FILLRECT
836-
select FB_CFB_COPYAREA
837-
select FB_CFB_IMAGEBLIT
838-
select FB_IOMEM_FOPS
839-
select FB_MODE_HELPERS
840-
select BOOT_VESA_SUPPORT if FB_INTEL = y
841-
select VIDEO_NOMODESET
842-
depends on !DRM_I915
843-
help
844-
This driver supports the on-board graphics built in to the Intel
845-
830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
846-
Say Y if you have and plan to use such a board.
847-
848-
To make FB_INTEL=Y work you need to say AGP_INTEL=y too.
849-
850-
To compile this driver as a module, choose M here: the
851-
module will be called intelfb.
852-
853-
For more information, please read <file:Documentation/fb/intelfb.rst>
854-
855-
config FB_INTEL_DEBUG
856-
bool "Intel driver Debug Messages"
857-
depends on FB_INTEL
858-
help
859-
Say Y here if you want the Intel driver to output all sorts
860-
of debugging information to provide to the maintainer when
861-
something goes wrong.
862-
863-
config FB_INTEL_I2C
864-
bool "DDC/I2C for Intel framebuffer support"
865-
depends on FB_INTEL
866-
select FB_DDC
867-
default y
868-
help
869-
Say Y here if you want DDC/I2C support for your on-board Intel graphics.
870-
871832
config FB_MATROX
872833
tristate "Matrox acceleration"
873834
depends on FB && PCI

drivers/video/fbdev/intelfb/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)