[v1,11/11] drm: Move dri1 core files to drm/dri1

Commit Message

Sam Ravnborg July 16, 2022, 6:17 p.m. UTC

To have more of the dri1 specific support in one place move the dri1
core files to the dri1 folder.
The files continue to be part of the drm module, we just refer to the files
with a folder name.

Signed-off-by: Sam Ravnborg <[e-mail]>
---
 drivers/gpu/drm/Makefile                     | 10 +++++++---
 drivers/gpu/drm/{ => dri1}/drm_agpsupport.c  |  0
 drivers/gpu/drm/{ => dri1}/drm_bufs.c        |  0
 drivers/gpu/drm/{ => dri1}/drm_context.c     |  0
 drivers/gpu/drm/{ => dri1}/drm_dma.c         |  0
 drivers/gpu/drm/{ => dri1}/drm_hashtab.c     |  0
 drivers/gpu/drm/{ => dri1}/drm_irq.c         |  0
 drivers/gpu/drm/{ => dri1}/drm_legacy_misc.c |  0
 drivers/gpu/drm/{ => dri1}/drm_lock.c        |  0
 drivers/gpu/drm/{ => dri1}/drm_memory.c      |  0
 drivers/gpu/drm/{ => dri1}/drm_scatter.c     |  0
 drivers/gpu/drm/{ => dri1}/drm_vm.c          |  0
 12 files changed, 7 insertions(+), 3 deletions(-)
 rename drivers/gpu/drm/{ => dri1}/drm_agpsupport.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_bufs.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_context.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_dma.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_hashtab.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_irq.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_legacy_misc.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_lock.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_memory.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_scatter.c (100%)
 rename drivers/gpu/drm/{ => dri1}/drm_vm.c (100%)

Comments

Javier Martinez Canillas July 17, 2022, 3:35 p.m. UTC | #1

On 7/16/22 20:17, Sam Ravnborg wrote:
> To have more of the dri1 specific support in one place move the dri1
> core files to the dri1 folder.
> The files continue to be part of the drm module, we just refer to the files
> with a folder name.
> 
> Signed-off-by: Sam Ravnborg <[e-mail]>
> ---

This patch shows how having them into a separate sub-directory pays
it forward since you won't even see any of these drm_ core files if
not interested about DRI1 drivers.

Reviewed-by: Javier Martinez Canillas <[e-mail]>

Patch

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index a3bd337bcab4..02ae13a71281 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -18,9 +18,13 @@  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_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_DRI1) += dri1/drm_agpsupport.o dri1/drm_bufs.o \
+			  dri1/drm_context.o dri1/drm_dma.o \
+			  dri1/drm_hashtab.o dri1/drm_irq.o \
+			  dri1/drm_legacy_misc.o dri1/drm_lock.o \
+			  dri1/drm_memory.o dri1/drm_scatter.o \
+			  dri1/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_agpsupport.c b/drivers/gpu/drm/dri1/drm_agpsupport.c
similarity index 100%
rename from drivers/gpu/drm/drm_agpsupport.c
rename to drivers/gpu/drm/dri1/drm_agpsupport.c
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/dri1/drm_bufs.c
similarity index 100%
rename from drivers/gpu/drm/drm_bufs.c
rename to drivers/gpu/drm/dri1/drm_bufs.c
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/dri1/drm_context.c
similarity index 100%
rename from drivers/gpu/drm/drm_context.c
rename to drivers/gpu/drm/dri1/drm_context.c
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/dri1/drm_dma.c
similarity index 100%
rename from drivers/gpu/drm/drm_dma.c
rename to drivers/gpu/drm/dri1/drm_dma.c
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/dri1/drm_hashtab.c
similarity index 100%
rename from drivers/gpu/drm/drm_hashtab.c
rename to drivers/gpu/drm/dri1/drm_hashtab.c
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/dri1/drm_irq.c
similarity index 100%
rename from drivers/gpu/drm/drm_irq.c
rename to drivers/gpu/drm/dri1/drm_irq.c
diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/dri1/drm_legacy_misc.c
similarity index 100%
rename from drivers/gpu/drm/drm_legacy_misc.c
rename to drivers/gpu/drm/dri1/drm_legacy_misc.c
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/dri1/drm_lock.c
similarity index 100%
rename from drivers/gpu/drm/drm_lock.c
rename to drivers/gpu/drm/dri1/drm_lock.c
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/dri1/drm_memory.c
similarity index 100%
rename from drivers/gpu/drm/drm_memory.c
rename to drivers/gpu/drm/dri1/drm_memory.c
diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/dri1/drm_scatter.c
similarity index 100%
rename from drivers/gpu/drm/drm_scatter.c
rename to drivers/gpu/drm/dri1/drm_scatter.c
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/dri1/drm_vm.c
similarity index 100%
rename from drivers/gpu/drm/drm_vm.c
rename to drivers/gpu/drm/dri1/drm_vm.c