The rename is done to make it more obvious what is DRI1 drivers
and what is other type of legacy.
Signed-off-by: Sam Ravnborg
---
arch/powerpc/configs/pmac32_defconfig | 2 +-
arch/powerpc/configs/ppc6xx_defconfig | 2 +-
drivers/char/agp/Makefile | 2 +-
drivers/char/agp/agp.h| 2 +-
drivers/gpu/drm/Kconfig | 10 -
drivers/gpu/drm/Makefile | 6 ++---
drivers/gpu/drm/drm_file.c| 4 ++--
drivers/gpu/drm/drm_internal.h| 2 +-
drivers/gpu/drm/drm_ioc32.c | 12 +-
drivers/gpu/drm/drm_ioctl.c | 2 +-
drivers/gpu/drm/drm_legacy.h | 32 +--
drivers/gpu/drm/drm_pci.c | 4 ++--
drivers/gpu/drm/drm_vblank.c | 8 +++
drivers/gpu/drm/drm_vm.c | 2 +-
include/drm/drm_auth.h| 2 +-
include/drm/drm_device.h | 2 +-
include/drm/drm_drv.h | 4 ++--
include/drm/drm_file.h| 2 +-
include/drm/drm_legacy.h | 2 +-
19 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/arch/powerpc/configs/pmac32_defconfig
b/arch/powerpc/configs/pmac32_defconfig
index 13885ec563d1..47bb0e8018e4 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -187,7 +187,7 @@ CONFIG_AGP=m
CONFIG_AGP_UNINORTH=m
CONFIG_DRM=m
CONFIG_DRM_RADEON=m
-CONFIG_DRM_LEGACY=y
+CONFIG_DRM_DRI1=y
CONFIG_DRM_R128=m
CONFIG_FB=y
CONFIG_FB_OF=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig
b/arch/powerpc/configs/ppc6xx_defconfig
index b622ecd73286..5616b669e6ab 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -694,7 +694,7 @@ CONFIG_AGP=y
CONFIG_AGP_UNINORTH=y
CONFIG_DRM=m
CONFIG_DRM_RADEON=m
-CONFIG_DRM_LEGACY=y
+CONFIG_DRM_DRI1=y
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_MGA=m
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 90ed8c789e48..360e8e9dde98 100644
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
agpgart-y := backend.o generic.o isoch.o
-ifeq ($(CONFIG_DRM_LEGACY),y)
+ifeq ($(CONFIG_DRM_DRI1),y)
agpgart-$(CONFIG_COMPAT) += compat_ioctl.o
agpgart-y += frontend.o
endif
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index bb09d64cd51e..97802b076d80 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -186,7 +186,7 @@ int agp_add_bridge(struct agp_bridge_data *bridge);
void agp_remove_bridge(struct agp_bridge_data *bridge);
/* Frontend routines. */
-#if IS_ENABLED(CONFIG_DRM_LEGACY)
+#if IS_ENABLED(CONFIG_DRM_DRI1)
int agp_frontend_initialize(void);
void agp_frontend_cleanup(void);
#else
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 1c91e1e861a5..024081480fcf 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -402,10 +402,10 @@ config DRM_HYPERV
If M is selected the module will be called hyperv_drm.
-# Keep legacy drivers last
+# Keep legacy DRI1 drivers last
-menuconfig DRM_LEGACY
- bool "Enable legacy drivers (DANGEROUS)"
+menuconfig DRM_DRI1
+ bool "Enable legacy DRI1 drivers (DANGEROUS)"
depends on DRM && MMU
help
Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous
@@ -419,7 +419,7 @@ menuconfig DRM_LEGACY
Unless you have strong reasons to go rogue, say "N".
-if DRM_LEGACY
+if DRM_DRI1
config DRM_TDFX
tristate "3dfx Banshee/Voodoo3+"
@@ -478,7 +478,7 @@ config DRM_SAVAGE
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
chipset. If M is selected the module will be called savage.
-endif # DRM_LEGACY
+endif # DRM_DRI1
config DRM_EXPORT_FOR_TESTS
bool
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 25016dcab55e..dd7f296ef9b8 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -18,9 +18,9 @@ drm-y :=drm_aperture.o drm_auth.o drm_cache.o \
drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \
drm_client_modeset.o drm_atomic_uapi.o \
drm_managed.o drm_vblank_work.o
-drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o
drm_dma.o \
- drm_hashtab.o drm_irq.o drm_legacy_misc.o
drm_lock.o \
- drm_memory.o drm_scatter.o drm_vm.o
+drm-$(CONFIG_DRM_DRI1) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \
+ drm_hashtab.o drm_irq.o drm_legacy_misc.o drm_lock.o \
+ drm_memory.o drm_scatter.o drm_vm.o
drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
drm-$(CONFIG_DRM_PANEL) += drm_panel.o
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index
