[1/2] drm: Mark up legacy/dri1 drivers with DRM_LEGACY

Commit Message

David Herrmann Aug. 4, 2016, 7:32 a.m. UTC

Hi

On Wed, Aug 3, 2016 at 9:11 PM, Daniel Vetter <[e-mail]> wrote:
> It's super confusing that new drivers need to be marked with
> DRIVER_MODESET when really it means DRIVER_MODERN. Much better to
> invert the meaning and rename it to something that's suitably
> off-putting.
>
> Since there's over 100 places using DRIVER_MODESET we need to roll out
> this change without a flag day.
>
> v2: Update docs.
>
> Signed-off-by: Daniel Vetter <[e-mail]>
> ---
>  Documentation/gpu/drm-internals.rst | 9 ++++++---
>  drivers/gpu/drm/i810/i810_drv.c     | 4 +---
>  drivers/gpu/drm/mga/mga_drv.c       | 2 +-
>  drivers/gpu/drm/r128/r128_drv.c     | 2 +-
>  drivers/gpu/drm/savage/savage_drv.c | 2 +-
>  drivers/gpu/drm/sis/sis_drv.c       | 2 +-
>  drivers/gpu/drm/tdfx/tdfx_drv.c     | 1 +
>  drivers/gpu/drm/via/via_drv.c       | 2 +-
>  include/drm/drmP.h                  | 1 +
>  9 files changed, 14 insertions(+), 11 deletions(-)

Reviewed-by: David Herrmann <[e-mail]>

Also, how about this:

Comments

Chris Wilson Aug. 4, 2016, 7:37 a.m. UTC | #1

On Thu, Aug 04, 2016 at 09:32:01AM +0200, David Herrmann wrote:
> Hi
> 
> On Wed, Aug 3, 2016 at 9:11 PM, Daniel Vetter <[e-mail]> wrote:
> > It's super confusing that new drivers need to be marked with
> > DRIVER_MODESET when really it means DRIVER_MODERN. Much better to
> > invert the meaning and rename it to something that's suitably
> > off-putting.
> >
> > Since there's over 100 places using DRIVER_MODESET we need to roll out
> > this change without a flag day.
> >
> > v2: Update docs.
> >
> > Signed-off-by: Daniel Vetter <[e-mail]>
> > ---
> >  Documentation/gpu/drm-internals.rst | 9 ++++++---
> >  drivers/gpu/drm/i810/i810_drv.c     | 4 +---
> >  drivers/gpu/drm/mga/mga_drv.c       | 2 +-
> >  drivers/gpu/drm/r128/r128_drv.c     | 2 +-
> >  drivers/gpu/drm/savage/savage_drv.c | 2 +-
> >  drivers/gpu/drm/sis/sis_drv.c       | 2 +-
> >  drivers/gpu/drm/tdfx/tdfx_drv.c     | 1 +
> >  drivers/gpu/drm/via/via_drv.c       | 2 +-
> >  include/drm/drmP.h                  | 1 +
> >  9 files changed, 14 insertions(+), 11 deletions(-)
> 
> Reviewed-by: David Herrmann <[e-mail]>
> 
> Also, how about this:

config DRM_LEGACY
	bool "Enable legacy drivers (DANGEROUS)"
	depends on DRM
	depends on BROKEN
	help
	  ...

Then everyone else gets depends on DRM_LEGACY. The benefit is that we
get the chance to add a useful help message and hopefully explains the
situation more cleary to devs.
-Chris

Patch

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index fc35731..e609cfc 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -111,6 +111,7 @@  source "drivers/gpu/drm/i2c/Kconfig"
 config DRM_TDFX
  tristate "3dfx Banshee/Voodoo3+"
  depends on DRM && PCI
+ depends on BROKEN
  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.
@@ -120,6 +121,7 @@  source "drivers/gpu/drm/arm/Kconfig"
 config DRM_R128
  tristate "ATI Rage 128"
  depends on DRM && PCI
+ depends on BROKEN
  select FW_LOADER
  help
   Choose this option if you have an ATI Rage 128 graphics card.  If M
@@ -181,6 +183,7 @@  config DRM_I810
  tristate "Intel I810"
  # !PREEMPT because of missing ioctl locking
  depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)
+ depends on 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
@@ -191,6 +194,7 @@  source "drivers/gpu/drm/i915/Kconfig"
 config DRM_MGA
  tristate "Matrox g200/g400"
  depends on DRM && PCI
+ depends on BROKEN
  select FW_LOADER
  help
   Choose this option if you have a Matrox G200, G400 or G450 graphics
@@ -201,6 +205,7 @@  config DRM_SIS
  tristate "SiS video cards"
  depends on DRM && AGP
  depends on FB_SIS || FB_SIS=n
+ depends on BROKEN
  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
@@ -209,6 +214,7 @@  config DRM_SIS
 config DRM_VIA
  tristate "Via unichrome video cards"
  depends on DRM && PCI
+ depends on BROKEN
  help
   Choose this option if you have a Via unichrome or compatible video
   chipset. If M is selected the module will be called via.
@@ -216,6 +222,7 @@  config DRM_VIA
 config DRM_SAVAGE
  tristate "Savage video cards"
  depends on DRM && PCI
+ depends on BROKEN
  help
   Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
   chipset. If M is selected the module will be called savage.