Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: Mark up legacy/dri1 drivers with DRM_LEGACY

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.

Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470251470-30830-1-git-send-email-daniel.vetter@ffwll.ch

+14 -11
+6 -3
Documentation/gpu/drm-internals.rst
··· 53 53 DRIVER_USE_AGP 54 54 Driver uses AGP interface, the DRM core will manage AGP resources. 55 55 56 - DRIVER_REQUIRE_AGP 57 - Driver needs AGP interface to function. AGP initialization failure 58 - will become a fatal error. 56 + DRIVER_LEGACY 57 + Denote a legacy driver using shadow attach. Don't use. 58 + 59 + DRIVER_KMS_LEGACY_CONTEXT 60 + Used only by nouveau for backwards compatibility with existing userspace. 61 + Don't use. 59 62 60 63 DRIVER_PCI_DMA 61 64 Driver is capable of PCI DMA, mapping of PCI DMA buffers to
+1 -3
drivers/gpu/drm/i810/i810_drv.c
··· 56 56 }; 57 57 58 58 static struct drm_driver driver = { 59 - .driver_features = 60 - DRIVER_USE_AGP | 61 - DRIVER_HAVE_DMA, 59 + .driver_features = DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_LEGACY, 62 60 .dev_priv_size = sizeof(drm_i810_buf_priv_t), 63 61 .load = i810_driver_load, 64 62 .lastclose = i810_driver_lastclose,
+1 -1
drivers/gpu/drm/mga/mga_drv.c
··· 58 58 59 59 static struct drm_driver driver = { 60 60 .driver_features = 61 - DRIVER_USE_AGP | DRIVER_PCI_DMA | 61 + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_LEGACY | 62 62 DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, 63 63 .dev_priv_size = sizeof(drm_mga_buf_priv_t), 64 64 .load = mga_driver_load,
+1 -1
drivers/gpu/drm/r128/r128_drv.c
··· 56 56 57 57 static struct drm_driver driver = { 58 58 .driver_features = 59 - DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | 59 + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_LEGACY | 60 60 DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, 61 61 .dev_priv_size = sizeof(drm_r128_buf_priv_t), 62 62 .load = r128_driver_load,
+1 -1
drivers/gpu/drm/savage/savage_drv.c
··· 50 50 51 51 static struct drm_driver driver = { 52 52 .driver_features = 53 - DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_PCI_DMA, 53 + DRIVER_USE_AGP | DRIVER_HAVE_DMA | DRIVER_PCI_DMA | DRIVER_LEGACY, 54 54 .dev_priv_size = sizeof(drm_savage_buf_priv_t), 55 55 .load = savage_driver_load, 56 56 .firstopen = savage_driver_firstopen,
+1 -1
drivers/gpu/drm/sis/sis_drv.c
··· 102 102 } 103 103 104 104 static struct drm_driver driver = { 105 - .driver_features = DRIVER_USE_AGP, 105 + .driver_features = DRIVER_USE_AGP | DRIVER_LEGACY, 106 106 .load = sis_driver_load, 107 107 .unload = sis_driver_unload, 108 108 .open = sis_driver_open,
+1
drivers/gpu/drm/tdfx/tdfx_drv.c
··· 56 56 }; 57 57 58 58 static struct drm_driver driver = { 59 + .driver_features = DRIVER_LEGACY, 59 60 .set_busid = drm_pci_set_busid, 60 61 .fops = &tdfx_driver_fops, 61 62 .name = DRIVER_NAME,
+1 -1
drivers/gpu/drm/via/via_drv.c
··· 72 72 73 73 static struct drm_driver driver = { 74 74 .driver_features = 75 - DRIVER_USE_AGP | DRIVER_HAVE_IRQ | 75 + DRIVER_USE_AGP | DRIVER_HAVE_IRQ | DRIVER_LEGACY | 76 76 DRIVER_IRQ_SHARED, 77 77 .load = via_driver_load, 78 78 .unload = via_driver_unload,
+1
include/drm/drmP.h
··· 146 146 147 147 /* driver capabilities and requirements mask */ 148 148 #define DRIVER_USE_AGP 0x1 149 + #define DRIVER_LEGACY 0x2 149 150 #define DRIVER_PCI_DMA 0x8 150 151 #define DRIVER_SG 0x10 151 152 #define DRIVER_HAVE_DMA 0x20