diff --git a/debian/changelog b/debian/changelog index e764f3b34..12ab5a67a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux-2.6 (3.2.19.dfsg.1-1) UNRELEASED; urgency=low + + * DFSG: video: Remove nvidiafb and rivafb, which include apparently + obfuscated code (Closes: #383481). The nouveau driver supports all + the same hardware, aside from RIVA 128 (NV3). + + -- Ben Hutchings Sat, 02 Jun 2012 20:31:53 +0100 + linux-2.6 (3.2.19-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 9ab681467..ad869b2df 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -964,11 +964,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_IMSTT is not set CONFIG_FB_TGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 01104c88b..da5fb674e 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -409,8 +409,6 @@ CONFIG_FB_ARMCLCD=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set diff --git a/debian/config/config b/debian/config/config index e62fda784..12c838caf 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3153,7 +3153,6 @@ CONFIG_FIRMWARE_EDID=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_ARC=m # CONFIG_FB_UVESA is not set -# CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_INTEL_DEBUG is not set # CONFIG_FB_INTEL_I2C is not set CONFIG_FB_S3=m diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 994b4add7..72ef81462 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -593,8 +593,6 @@ CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_IMSTT is not set CONFIG_FB_STI=y # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set diff --git a/debian/config/ia64/config b/debian/config/ia64/config index dca49dde7..2cb0be642 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -719,11 +719,6 @@ CONFIG_FB_CYBER2000=m CONFIG_FB_ASILIANT=y # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 49ff1f736..fc53108ba 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1458,11 +1458,6 @@ CONFIG_FB_EFI=y CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m # CONFIG_FB_INTEL is not set diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index fa9d69330..faffc2fd6 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -464,7 +464,6 @@ CONFIG_SERIAL_8250_EXAR_ST16C554=m ## ## file: drivers/video/Kconfig ## -CONFIG_FB_NVIDIA_I2C=y CONFIG_FB_I810=m # CONFIG_FB_I810_GTF is not set CONFIG_FB_MATROX_G=y diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index e75dc1c25..aab869117 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -96,7 +96,6 @@ CONFIG_ISI=m ## ## file: drivers/video/Kconfig ## -# CONFIG_FB_NVIDIA_I2C is not set CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_MAVEN=m # CONFIG_FB_ATY_GENERIC_LCD is not set diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index d9ea86dae..939cc6a88 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -998,11 +998,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 82d3d4c28..449788f49 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1002,11 +1002,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -# CONFIG_FB_RIVA is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 7f0b00e7d..4ff39a62b 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -556,8 +556,6 @@ CONFIG_FB=y CONFIG_FB_GBE=y CONFIG_FB_GBE_MEM=4 # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index d61b2068e..d147c08ea 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -696,11 +696,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_RIVA=m -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 5f04135dd..fd8b09cfc 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -702,11 +702,6 @@ CONFIG_FB_CYBER2000=m # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -# CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_RIVA=m -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 600178e41..86f495841 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -820,11 +820,6 @@ CONFIG_FB_CT65550=y # CONFIG_FB_ASILIANT is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=y -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_RIVA is not set -# CONFIG_FB_RIVA_I2C is not set -# CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_MATROX=y CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index 5cf63de40..5b29c839b 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -185,7 +185,6 @@ CONFIG_HVCS=m # CONFIG_FB_PLATINUM is not set # CONFIG_FB_VALKYRIE is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_NVIDIA is not set # CONFIG_FB_ATY128 is not set CONFIG_FB_PS3=y CONFIG_FB_PS3_DEFAULT_SIZE_M=9 diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 99549f6a3..9a8d84ab6 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -504,8 +504,6 @@ CONFIG_FB_XVR500=y CONFIG_FB_XVR2500=y CONFIG_FB_XVR1000=y # CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set # CONFIG_FB_MATROX is not set CONFIG_FB_RADEON=y # CONFIG_FB_RADEON_I2C is not set diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index c8b9dbd3e..2b0e90ff9 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -23,5 +23,9 @@ unifdef drivers/staging/rtl8192e/r8192E_hwimg.c -UREMOVE_DFSG rm drivers/staging/wlags49_h2/ap_*.c rm drivers/staging/wlags49_h2/sta_*.c +# These include apparently obfuscated code +rm drivers/video/nvidia/ +rm drivers/video/riva/ + rm sound/pci/cs46xx/cs46xx_image.h rm sound/pci/cs46xx/imgs diff --git a/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch new file mode 100644 index 000000000..e9abe4768 --- /dev/null +++ b/debian/patches/debian/dfsg/video-remove-nvidiafb-and-rivafb.patch @@ -0,0 +1,137 @@ +From: Ben Hutchings +Date: Sat, 2 Jun 2012 19:53:38 +0100 +Subject: video: Remove nvidiafb and rivafb +Bug-Debian: http://bugs.debian.org/383481 + +These drivers contain register programming code provided by the +hardware vendor that appears to have been deliberately obfuscated. +This is arguably not the preferred form for modification. + +These drivers are also largely redundant with nouveau. The RIVA 128 +(NV3) is not supported by nouveau but is about 15 years old and +probably discontinued 10 years ago. + +--- + drivers/video/Kconfig | 95 ------------------------------------------------ + drivers/video/Makefile | 2 - + 2 files changed, 97 deletions(-) + +diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig +index d83e967..fe92039 100644 +--- a/drivers/video/Kconfig ++++ b/drivers/video/Kconfig +@@ -1028,101 +1028,6 @@ config FB_ATMEL_STN + + If unsure, say N. + +-config FB_NVIDIA +- tristate "nVidia Framebuffer Support" +- depends on FB && PCI +- select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT +- select FB_MODE_HELPERS +- select FB_CFB_FILLRECT +- select FB_CFB_COPYAREA +- select FB_CFB_IMAGEBLIT +- select BITREVERSE +- select VGASTATE +- help +- This driver supports graphics boards with the nVidia chips, TNT +- and newer. For very old chipsets, such as the RIVA128, then use +- the rivafb. +- Say Y if you have such a graphics board. +- +- To compile this driver as a module, choose M here: the +- module will be called nvidiafb. +- +-config FB_NVIDIA_I2C +- bool "Enable DDC Support" +- depends on FB_NVIDIA +- select FB_DDC +- help +- This enables I2C support for nVidia Chipsets. This is used +- only for getting EDID information from the attached display +- allowing for robust video mode handling and switching. +- +- Because fbdev-2.6 requires that drivers must be able to +- independently validate video mode parameters, you should say Y +- here. +- +-config FB_NVIDIA_DEBUG +- bool "Lots of debug output" +- depends on FB_NVIDIA +- default n +- help +- Say Y here if you want the nVidia driver to output all sorts +- of debugging information to provide to the maintainer when +- something goes wrong. +- +-config FB_NVIDIA_BACKLIGHT +- bool "Support for backlight control" +- depends on FB_NVIDIA +- default y +- help +- Say Y here if you want to control the backlight of your display. +- +-config FB_RIVA +- tristate "nVidia Riva support" +- depends on FB && PCI +- select FB_BACKLIGHT if FB_RIVA_BACKLIGHT +- select FB_MODE_HELPERS +- select FB_CFB_FILLRECT +- select FB_CFB_COPYAREA +- select FB_CFB_IMAGEBLIT +- select BITREVERSE +- select VGASTATE +- help +- This driver supports graphics boards with the nVidia Riva/Geforce +- chips. +- Say Y if you have such a graphics board. +- +- To compile this driver as a module, choose M here: the +- module will be called rivafb. +- +-config FB_RIVA_I2C +- bool "Enable DDC Support" +- depends on FB_RIVA +- select FB_DDC +- help +- This enables I2C support for nVidia Chipsets. This is used +- only for getting EDID information from the attached display +- allowing for robust video mode handling and switching. +- +- Because fbdev-2.6 requires that drivers must be able to +- independently validate video mode parameters, you should say Y +- here. +- +-config FB_RIVA_DEBUG +- bool "Lots of debug output" +- depends on FB_RIVA +- default n +- help +- Say Y here if you want the Riva driver to output all sorts +- of debugging information to provide to the maintainer when +- something goes wrong. +- +-config FB_RIVA_BACKLIGHT +- bool "Support for backlight control" +- depends on FB_RIVA +- default y +- help +- Say Y here if you want to control the backlight of your display. +- + config FB_I810 + tristate "Intel 810/815 support (EXPERIMENTAL)" + depends on EXPERIMENTAL && FB && PCI && X86_32 && AGP_INTEL +diff --git a/drivers/video/Makefile b/drivers/video/Makefile +index 9b9d8ff..4361446 100644 +--- a/drivers/video/Makefile ++++ b/drivers/video/Makefile +@@ -38,8 +38,6 @@ obj-$(CONFIG_FB_PM2) += pm2fb.o + obj-$(CONFIG_FB_PM3) += pm3fb.o + + obj-$(CONFIG_FB_MATROX) += matrox/ +-obj-$(CONFIG_FB_RIVA) += riva/ +-obj-$(CONFIG_FB_NVIDIA) += nvidia/ + obj-$(CONFIG_FB_ATY) += aty/ macmodes.o + obj-$(CONFIG_FB_ATY128) += aty/ macmodes.o + obj-$(CONFIG_FB_RADEON) += aty/ diff --git a/debian/patches/series/orig b/debian/patches/series/orig index 182788f6e..2df90d023 100644 --- a/debian/patches/series/orig +++ b/debian/patches/series/orig @@ -3,6 +3,7 @@ + debian/dfsg/drivers-net-appletalk-cops.patch + debian/dfsg/drivers-staging-wlags49_h2-disable.patch + debian/dfsg/drivers-staging-wlags49_h25-disable.patch ++ debian/dfsg/video-remove-nvidiafb-and-rivafb.patch + debian/dfsg/r8192e-remove-firmware-again.patch + debian/dfsg/firmware-cleanup.patch + debian/dfsg/sound-pci.patch