Skip to content

Commit d92d9c3

Browse files
David Herrmanndanvet
authored andcommitted
drm: hide legacy drivers with CONFIG_DRM_LEGACY
Lets move forward and hide the remaining DRI1 drivers behind a config option, so we have a central place to disable them all. Furthermore, we can provide a clear warning to anyone enabling them. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20160804080657.9664-1-dh.herrmann@gmail.com
1 parent 2035333 commit d92d9c3

File tree

1 file changed

+78
-57
lines changed

1 file changed

+78
-57
lines changed

drivers/gpu/drm/Kconfig

Lines changed: 78 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -108,24 +108,8 @@ config DRM_KMS_CMA_HELPER
108108

109109
source "drivers/gpu/drm/i2c/Kconfig"
110110

111-
config DRM_TDFX
112-
tristate "3dfx Banshee/Voodoo3+"
113-
depends on DRM && PCI
114-
help
115-
Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
116-
graphics card. If M is selected, the module will be called tdfx.
117-
118111
source "drivers/gpu/drm/arm/Kconfig"
119112

120-
config DRM_R128
121-
tristate "ATI Rage 128"
122-
depends on DRM && PCI
123-
select FW_LOADER
124-
help
125-
Choose this option if you have an ATI Rage 128 graphics card. If M
126-
is selected, the module will be called r128. AGP support for
127-
this card is strongly suggested (unless you have a PCI version).
128-
129113
config DRM_RADEON
130114
tristate "ATI Radeon"
131115
depends on DRM && PCI
@@ -169,49 +153,8 @@ source "drivers/gpu/drm/amd/acp/Kconfig"
169153

170154
source "drivers/gpu/drm/nouveau/Kconfig"
171155

172-
config DRM_I810
173-
tristate "Intel I810"
174-
# !PREEMPT because of missing ioctl locking
175-
depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)
176-
help
177-
Choose this option if you have an Intel I810 graphics card. If M is
178-
selected, the module will be called i810. AGP support is required
179-
for this driver to work.
180-
181156
source "drivers/gpu/drm/i915/Kconfig"
182157

183-
config DRM_MGA
184-
tristate "Matrox g200/g400"
185-
depends on DRM && PCI
186-
select FW_LOADER
187-
help
188-
Choose this option if you have a Matrox G200, G400 or G450 graphics
189-
card. If M is selected, the module will be called mga. AGP
190-
support is required for this driver to work.
191-
192-
config DRM_SIS
193-
tristate "SiS video cards"
194-
depends on DRM && AGP
195-
depends on FB_SIS || FB_SIS=n
196-
help
197-
Choose this option if you have a SiS 630 or compatible video
198-
chipset. If M is selected the module will be called sis. AGP
199-
support is required for this driver to work.
200-
201-
config DRM_VIA
202-
tristate "Via unichrome video cards"
203-
depends on DRM && PCI
204-
help
205-
Choose this option if you have a Via unichrome or compatible video
206-
chipset. If M is selected the module will be called via.
207-
208-
config DRM_SAVAGE
209-
tristate "Savage video cards"
210-
depends on DRM && PCI
211-
help
212-
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
213-
chipset. If M is selected the module will be called savage.
214-
215158
config DRM_VGEM
216159
tristate "Virtual GEM provider"
217160
depends on DRM
@@ -282,3 +225,81 @@ source "drivers/gpu/drm/arc/Kconfig"
282225
source "drivers/gpu/drm/hisilicon/Kconfig"
283226

284227
source "drivers/gpu/drm/mediatek/Kconfig"
228+
229+
# Keep legacy drivers last
230+
231+
menuconfig DRM_LEGACY
232+
bool "Enable legacy drivers (DANGEROUS)"
233+
depends on DRM
234+
help
235+
Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous
236+
APIs to user-space, which can be used to circumvent access
237+
restrictions and other security measures. For backwards compatibility
238+
those drivers are still available, but their use is highly
239+
inadvisable and might harm your system.
240+
241+
You are recommended to use the safe modeset-only drivers instead, and
242+
perform 3D emulation in user-space.
243+
244+
Unless you have strong reasons to go rogue, say "N".
245+
246+
if DRM_LEGACY
247+
248+
config DRM_TDFX
249+
tristate "3dfx Banshee/Voodoo3+"
250+
depends on DRM && PCI
251+
help
252+
Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
253+
graphics card. If M is selected, the module will be called tdfx.
254+
255+
config DRM_R128
256+
tristate "ATI Rage 128"
257+
depends on DRM && PCI
258+
select FW_LOADER
259+
help
260+
Choose this option if you have an ATI Rage 128 graphics card. If M
261+
is selected, the module will be called r128. AGP support for
262+
this card is strongly suggested (unless you have a PCI version).
263+
264+
config DRM_I810
265+
tristate "Intel I810"
266+
# !PREEMPT because of missing ioctl locking
267+
depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)
268+
help
269+
Choose this option if you have an Intel I810 graphics card. If M is
270+
selected, the module will be called i810. AGP support is required
271+
for this driver to work.
272+
273+
config DRM_MGA
274+
tristate "Matrox g200/g400"
275+
depends on DRM && PCI
276+
select FW_LOADER
277+
help
278+
Choose this option if you have a Matrox G200, G400 or G450 graphics
279+
card. If M is selected, the module will be called mga. AGP
280+
support is required for this driver to work.
281+
282+
config DRM_SIS
283+
tristate "SiS video cards"
284+
depends on DRM && AGP
285+
depends on FB_SIS || FB_SIS=n
286+
help
287+
Choose this option if you have a SiS 630 or compatible video
288+
chipset. If M is selected the module will be called sis. AGP
289+
support is required for this driver to work.
290+
291+
config DRM_VIA
292+
tristate "Via unichrome video cards"
293+
depends on DRM && PCI
294+
help
295+
Choose this option if you have a Via unichrome or compatible video
296+
chipset. If M is selected the module will be called via.
297+
298+
config DRM_SAVAGE
299+
tristate "Savage video cards"
300+
depends on DRM && PCI
301+
help
302+
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
303+
chipset. If M is selected the module will be called savage.
304+
305+
endif # DRM_LEGACY

0 commit comments

Comments
 (0)