From c4a9e910ad587b96628b2317fd70953cb46eccad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= Date: Tue, 29 May 2012 23:12:15 +0200 Subject: [PATCH] drm: Stow drivers for various chip families putting them into their own subdirectories in sys/dev/drm/ Inspired-by: David Shao's dflygsocdrm work --- sys/conf/files | 68 ++++++++++----------- sys/dev/drm/i915/Makefile | 4 +- sys/dev/drm/{ => i915}/i915_dma.c | 2 +- sys/dev/drm/{ => i915}/i915_drv.c | 2 +- sys/dev/drm/{ => i915}/i915_drv.h | 2 +- sys/dev/drm/{ => i915}/i915_irq.c | 2 +- sys/dev/drm/{ => i915}/i915_mem.c | 2 +- sys/dev/drm/{ => i915}/i915_reg.h | 0 sys/dev/drm/{ => i915}/i915_suspend.c | 2 +- sys/dev/drm/mach64/Makefile | 4 +- sys/dev/drm/{ => mach64}/mach64_dma.c | 2 +- sys/dev/drm/{ => mach64}/mach64_drv.c | 2 +- sys/dev/drm/{ => mach64}/mach64_drv.h | 0 sys/dev/drm/{ => mach64}/mach64_irq.c | 2 +- sys/dev/drm/{ => mach64}/mach64_state.c | 2 +- sys/dev/drm/mga/Makefile | 4 +- sys/dev/drm/{ => mga}/mga_dma.c | 2 +- sys/dev/drm/{ => mga}/mga_drv.c | 2 +- sys/dev/drm/{ => mga}/mga_drv.h | 0 sys/dev/drm/{ => mga}/mga_irq.c | 2 +- sys/dev/drm/{ => mga}/mga_state.c | 2 +- sys/dev/drm/{ => mga}/mga_ucode.h | 0 sys/dev/drm/{ => mga}/mga_warp.c | 4 +- sys/dev/drm/r128/Makefile | 4 +- sys/dev/drm/{ => r128}/r128_cce.c | 2 +- sys/dev/drm/{ => r128}/r128_drv.c | 2 +- sys/dev/drm/{ => r128}/r128_drv.h | 0 sys/dev/drm/{ => r128}/r128_irq.c | 2 +- sys/dev/drm/{ => r128}/r128_state.c | 2 +- sys/dev/drm/radeon/Makefile | 6 +- sys/dev/drm/{ => radeon}/r300_cmdbuf.c | 4 +- sys/dev/drm/{ => radeon}/r300_reg.h | 0 sys/dev/drm/{ => radeon}/r600_blit.c | 2 +- sys/dev/drm/{ => radeon}/r600_cp.c | 4 +- sys/dev/drm/{ => radeon}/r600_microcode.h | 0 sys/dev/drm/{ => radeon}/radeon_cp.c | 6 +- sys/dev/drm/{ => radeon}/radeon_cs.c | 2 +- sys/dev/drm/{ => radeon}/radeon_drv.c | 2 +- sys/dev/drm/{ => radeon}/radeon_drv.h | 0 sys/dev/drm/{ => radeon}/radeon_irq.c | 4 +- sys/dev/drm/{ => radeon}/radeon_mem.c | 2 +- sys/dev/drm/{ => radeon}/radeon_microcode.h | 0 sys/dev/drm/{ => radeon}/radeon_state.c | 2 +- sys/dev/drm/savage/Makefile | 4 +- sys/dev/drm/{ => savage}/savage_bci.c | 2 +- sys/dev/drm/{ => savage}/savage_drv.c | 2 +- sys/dev/drm/{ => savage}/savage_drv.h | 0 sys/dev/drm/{ => savage}/savage_state.c | 2 +- sys/dev/drm/sis/Makefile | 4 +- sys/dev/drm/{ => sis}/sis_drv.c | 2 +- sys/dev/drm/{ => sis}/sis_drv.h | 2 +- sys/dev/drm/{ => sis}/sis_ds.c | 2 +- sys/dev/drm/{ => sis}/sis_ds.h | 0 sys/dev/drm/{ => sis}/sis_mm.c | 4 +- sys/dev/drm/tdfx/Makefile | 4 +- sys/dev/drm/{ => tdfx}/tdfx_drv.c | 2 +- sys/dev/drm/{ => tdfx}/tdfx_drv.h | 0 57 files changed, 94 insertions(+), 94 deletions(-) rename sys/dev/drm/{ => i915}/i915_dma.c (99%) rename sys/dev/drm/{ => i915}/i915_drv.c (99%) rename sys/dev/drm/{ => i915}/i915_drv.h (99%) rename sys/dev/drm/{ => i915}/i915_irq.c (99%) rename sys/dev/drm/{ => i915}/i915_mem.c (99%) rename sys/dev/drm/{ => i915}/i915_reg.h (100%) rename sys/dev/drm/{ => i915}/i915_suspend.c (99%) rename sys/dev/drm/{ => mach64}/mach64_dma.c (99%) rename sys/dev/drm/{ => mach64}/mach64_drv.c (99%) rename sys/dev/drm/{ => mach64}/mach64_drv.h (100%) rename sys/dev/drm/{ => mach64}/mach64_irq.c (99%) rename sys/dev/drm/{ => mach64}/mach64_state.c (99%) rename sys/dev/drm/{ => mga}/mga_dma.c (99%) rename sys/dev/drm/{ => mga}/mga_drv.c (99%) rename sys/dev/drm/{ => mga}/mga_drv.h (100%) rename sys/dev/drm/{ => mga}/mga_irq.c (99%) rename sys/dev/drm/{ => mga}/mga_state.c (99%) rename sys/dev/drm/{ => mga}/mga_ucode.h (100%) rename sys/dev/drm/{ => mga}/mga_warp.c (99%) rename sys/dev/drm/{ => r128}/r128_cce.c (99%) rename sys/dev/drm/{ => r128}/r128_drv.c (99%) rename sys/dev/drm/{ => r128}/r128_drv.h (100%) rename sys/dev/drm/{ => r128}/r128_irq.c (99%) rename sys/dev/drm/{ => r128}/r128_state.c (99%) rename sys/dev/drm/{ => radeon}/r300_cmdbuf.c (99%) rename sys/dev/drm/{ => radeon}/r300_reg.h (100%) rename sys/dev/drm/{ => radeon}/r600_blit.c (99%) rename sys/dev/drm/{ => radeon}/r600_cp.c (99%) rename sys/dev/drm/{ => radeon}/r600_microcode.h (100%) rename sys/dev/drm/{ => radeon}/radeon_cp.c (99%) rename sys/dev/drm/{ => radeon}/radeon_cs.c (99%) rename sys/dev/drm/{ => radeon}/radeon_drv.c (99%) rename sys/dev/drm/{ => radeon}/radeon_drv.h (100%) rename sys/dev/drm/{ => radeon}/radeon_irq.c (98%) rename sys/dev/drm/{ => radeon}/radeon_mem.c (99%) rename sys/dev/drm/{ => radeon}/radeon_microcode.h (100%) rename sys/dev/drm/{ => radeon}/radeon_state.c (99%) rename sys/dev/drm/{ => savage}/savage_bci.c (99%) rename sys/dev/drm/{ => savage}/savage_drv.c (99%) rename sys/dev/drm/{ => savage}/savage_drv.h (100%) rename sys/dev/drm/{ => savage}/savage_state.c (99%) rename sys/dev/drm/{ => sis}/sis_drv.c (99%) rename sys/dev/drm/{ => sis}/sis_drv.h (98%) rename sys/dev/drm/{ => sis}/sis_ds.c (99%) rename sys/dev/drm/{ => sis}/sis_ds.h (100%) rename sys/dev/drm/{ => sis}/sis_mm.c (99%) rename sys/dev/drm/{ => tdfx}/tdfx_drv.c (99%) rename sys/dev/drm/{ => tdfx}/tdfx_drv.h (100%) diff --git a/sys/conf/files b/sys/conf/files index 50aab1999e..2cade9b5c8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1901,40 +1901,40 @@ dev/drm/drm_sman.c optional drm dev/drm/drm_subr_hash.c optional drm dev/drm/drm_sysctl.c optional drm dev/drm/drm_vm.c optional drm -dev/drm/i915_dma.c optional i915drm drm -dev/drm/i915_drv.c optional i915drm drm -dev/drm/i915_irq.c optional i915drm drm -dev/drm/i915_mem.c optional i915drm drm -dev/drm/i915_suspend.c optional i915drm drm -dev/drm/mach64_dma.c optional mach64drm drm -dev/drm/mach64_drv.c optional mach64drm drm -dev/drm/mach64_irq.c optional mach64drm drm -dev/drm/mach64_state.c optional mach64drm drm -dev/drm/mga_drv.c optional mgadrm drm -dev/drm/mga_state.c optional mgadrm drm -dev/drm/mga_warp.c optional mgadrm drm -dev/drm/mga_dma.c optional mgadrm drm -dev/drm/mga_irq.c optional mgadrm drm -dev/drm/r128_cce.c optional r128drm drm -dev/drm/r128_drv.c optional r128drm drm -dev/drm/r128_state.c optional r128drm drm -dev/drm/r128_irq.c optional r128drm drm -dev/drm/r300_cmdbuf.c optional radeondrm drm -dev/drm/r600_blit.c optional radeondrm drm -dev/drm/r600_cp.c optional radeondrm drm -dev/drm/radeon_cp.c optional radeondrm drm -dev/drm/radeon_cs.c optional radeondrm drm -dev/drm/radeon_drv.c optional radeondrm drm -dev/drm/radeon_state.c optional radeondrm drm -dev/drm/radeon_irq.c optional radeondrm drm -dev/drm/radeon_mem.c optional radeondrm drm -dev/drm/savage_bci.c optional savagedrm drm -dev/drm/savage_drv.c optional savagedrm drm -dev/drm/savage_state.c optional savagedrm drm -dev/drm/sis_drv.c optional sisdrm drm -dev/drm/sis_ds.c optional sisdrm drm -dev/drm/sis_mm.c optional sisdrm drm -dev/drm/tdfx_drv.c optional tdfxdrm drm +dev/drm/i915/i915_dma.c optional i915drm drm +dev/drm/i915/i915_drv.c optional i915drm drm +dev/drm/i915/i915_irq.c optional i915drm drm +dev/drm/i915/i915_mem.c optional i915drm drm +dev/drm/i915/i915_suspend.c optional i915drm drm +dev/drm/mach64/mach64_dma.c optional mach64drm drm +dev/drm/mach64/mach64_drv.c optional mach64drm drm +dev/drm/mach64/mach64_irq.c optional mach64drm drm +dev/drm/mach64/mach64_state.c optional mach64drm drm +dev/drm/mga/mga_dma.c optional mgadrm drm +dev/drm/mga/mga_drv.c optional mgadrm drm +dev/drm/mga/mga_irq.c optional mgadrm drm +dev/drm/mga/mga_state.c optional mgadrm drm +dev/drm/mga/mga_warp.c optional mgadrm drm +dev/drm/r128/r128_cce.c optional r128drm drm +dev/drm/r128/r128_drv.c optional r128drm drm +dev/drm/r128/r128_state.c optional r128drm drm +dev/drm/r128/r128_irq.c optional r128drm drm +dev/drm/radeon/r300_cmdbuf.c optional radeondrm drm +dev/drm/radeon/r600_blit.c optional radeondrm drm +dev/drm/radeon/r600_cp.c optional radeondrm drm +dev/drm/radeon/radeon_cp.c optional radeondrm drm +dev/drm/radeon/radeon_cs.c optional radeondrm drm +dev/drm/radeon/radeon_drv.c optional radeondrm drm +dev/drm/radeon/radeon_irq.c optional radeondrm drm +dev/drm/radeon/radeon_mem.c optional radeondrm drm +dev/drm/radeon/radeon_state.c optional radeondrm drm +dev/drm/savage/savage_bci.c optional savagedrm drm +dev/drm/savage/savage_drv.c optional savagedrm drm +dev/drm/savage/savage_state.c optional savagedrm drm +dev/drm/sis/sis_drv.c optional sisdrm drm +dev/drm/sis/sis_ds.c optional sisdrm drm +dev/drm/sis/sis_mm.c optional sisdrm drm +dev/drm/tdfx/tdfx_drv.c optional tdfxdrm drm dev/misc/nsclpcsio/nsclpcsio_isa.c optional nsclpcsio isa dev/powermng/aps/aps.c optional aps isa dev/powermng/it/it.c optional it isa diff --git a/sys/dev/drm/i915/Makefile b/sys/dev/drm/i915/Makefile index f8774079a5..a52b28bb5c 100644 --- a/sys/dev/drm/i915/Makefile +++ b/sys/dev/drm/i915/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD = i915 SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c i915_suspend.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS += ${DEBUG_FLAGS} -I. -I.. +CFLAGS += ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/i915 .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/i915_dma.c b/sys/dev/drm/i915/i915_dma.c similarity index 99% rename from sys/dev/drm/i915_dma.c rename to sys/dev/drm/i915/i915_dma.c index 08f91f43f7..787b0b16e5 100644 --- a/sys/dev/drm/i915_dma.c +++ b/sys/dev/drm/i915/i915_dma.c @@ -29,7 +29,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/i915_drm.h" -#include "dev/drm/i915_drv.h" +#include "dev/drm/i915/i915_drv.h" /* Really want an OS-independent resettable timer. Would like to have * this loop run for (eg) 3 sec, but have the timer reset every time diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915/i915_drv.c similarity index 99% rename from sys/dev/drm/i915_drv.c rename to sys/dev/drm/i915/i915_drv.c index c9e5461c8e..fbf35f6882 100644 --- a/sys/dev/drm/i915_drv.c +++ b/sys/dev/drm/i915/i915_drv.c @@ -33,7 +33,7 @@ #include "dev/drm/drm.h" #include "dev/drm/drm_mm.h" #include "dev/drm/i915_drm.h" -#include "dev/drm/i915_drv.h" +#include "i915_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/i915_drv.h b/sys/dev/drm/i915/i915_drv.h similarity index 99% rename from sys/dev/drm/i915_drv.h rename to sys/dev/drm/i915/i915_drv.h index 0669a1b849..b6fb5289da 100644 --- a/sys/dev/drm/i915_drv.h +++ b/sys/dev/drm/i915/i915_drv.h @@ -31,7 +31,7 @@ #define _I915_DRV_H_ #include "dev/drm/drm_mm.h" -#include "dev/drm/i915_reg.h" +#include "i915_reg.h" /* General customization: */ diff --git a/sys/dev/drm/i915_irq.c b/sys/dev/drm/i915/i915_irq.c similarity index 99% rename from sys/dev/drm/i915_irq.c rename to sys/dev/drm/i915/i915_irq.c index 44e00081ca..7ba4187968 100644 --- a/sys/dev/drm/i915_irq.c +++ b/sys/dev/drm/i915/i915_irq.c @@ -29,7 +29,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/i915_drm.h" -#include "dev/drm/i915_drv.h" +#include "i915_drv.h" #define MAX_NOPID ((u32)~0) diff --git a/sys/dev/drm/i915_mem.c b/sys/dev/drm/i915/i915_mem.c similarity index 99% rename from sys/dev/drm/i915_mem.c rename to sys/dev/drm/i915/i915_mem.c index 86111e32a1..a77ec9584d 100644 --- a/sys/dev/drm/i915_mem.c +++ b/sys/dev/drm/i915/i915_mem.c @@ -29,7 +29,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/i915_drm.h" -#include "dev/drm/i915_drv.h" +#include "i915_drv.h" /* This memory manager is integrated into the global/local lru * mechanisms used by the clients. Specifically, it operates by diff --git a/sys/dev/drm/i915_reg.h b/sys/dev/drm/i915/i915_reg.h similarity index 100% rename from sys/dev/drm/i915_reg.h rename to sys/dev/drm/i915/i915_reg.h diff --git a/sys/dev/drm/i915_suspend.c b/sys/dev/drm/i915/i915_suspend.c similarity index 99% rename from sys/dev/drm/i915_suspend.c rename to sys/dev/drm/i915/i915_suspend.c index afac3b3736..59ea9e3fea 100644 --- a/sys/dev/drm/i915_suspend.c +++ b/sys/dev/drm/i915/i915_suspend.c @@ -30,7 +30,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/i915_drm.h" -#include "dev/drm/i915_drv.h" +#include "i915_drv.h" static bool i915_pipe_enabled(struct drm_device *dev, enum i915_pipe pipe) { diff --git a/sys/dev/drm/mach64/Makefile b/sys/dev/drm/mach64/Makefile index 9ddba443ee..17825ce039 100644 --- a/sys/dev/drm/mach64/Makefile +++ b/sys/dev/drm/mach64/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD = mach64 SRCS = mach64_dma.c mach64_drv.c mach64_irq.c mach64_state.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS += ${DEBUG_FLAGS} -I. -I.. +CFLAGS += ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/mach64 .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/mach64_dma.c b/sys/dev/drm/mach64/mach64_dma.c similarity index 99% rename from sys/dev/drm/mach64_dma.c rename to sys/dev/drm/mach64/mach64_dma.c index c7236d47f8..9b25abc11f 100644 --- a/sys/dev/drm/mach64_dma.c +++ b/sys/dev/drm/mach64/mach64_dma.c @@ -37,7 +37,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mach64_drm.h" -#include "dev/drm/mach64_drv.h" +#include "mach64_drv.h" /*******************************************************************/ /** \name Engine, FIFO control */ diff --git a/sys/dev/drm/mach64_drv.c b/sys/dev/drm/mach64/mach64_drv.c similarity index 99% rename from sys/dev/drm/mach64_drv.c rename to sys/dev/drm/mach64/mach64_drv.c index 229fe5bf86..efbff3f9f2 100644 --- a/sys/dev/drm/mach64_drv.c +++ b/sys/dev/drm/mach64/mach64_drv.c @@ -35,7 +35,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mach64_drm.h" -#include "dev/drm/mach64_drv.h" +#include "mach64_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/mach64_drv.h b/sys/dev/drm/mach64/mach64_drv.h similarity index 100% rename from sys/dev/drm/mach64_drv.h rename to sys/dev/drm/mach64/mach64_drv.h diff --git a/sys/dev/drm/mach64_irq.c b/sys/dev/drm/mach64/mach64_irq.c similarity index 99% rename from sys/dev/drm/mach64_irq.c rename to sys/dev/drm/mach64/mach64_irq.c index fae8897303..00e212a79d 100644 --- a/sys/dev/drm/mach64_irq.c +++ b/sys/dev/drm/mach64/mach64_irq.c @@ -38,7 +38,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mach64_drm.h" -#include "dev/drm/mach64_drv.h" +#include "mach64_drv.h" irqreturn_t mach64_driver_irq_handler(DRM_IRQ_ARGS) { diff --git a/sys/dev/drm/mach64_state.c b/sys/dev/drm/mach64/mach64_state.c similarity index 99% rename from sys/dev/drm/mach64_state.c rename to sys/dev/drm/mach64/mach64_state.c index 186d55eaf0..84d5d547b0 100644 --- a/sys/dev/drm/mach64_state.c +++ b/sys/dev/drm/mach64/mach64_state.c @@ -33,7 +33,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mach64_drm.h" -#include "dev/drm/mach64_drv.h" +#include "mach64_drv.h" /* Interface history: * diff --git a/sys/dev/drm/mga/Makefile b/sys/dev/drm/mga/Makefile index bc3d444f43..933adc146e 100644 --- a/sys/dev/drm/mga/Makefile +++ b/sys/dev/drm/mga/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD= mga SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c mga_irq.c SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS+= ${DEBUG_FLAGS} -I. -I.. +CFLAGS+= ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/mga .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/mga_dma.c b/sys/dev/drm/mga/mga_dma.c similarity index 99% rename from sys/dev/drm/mga_dma.c rename to sys/dev/drm/mga/mga_dma.c index bec9cb5ba6..7d366c5f62 100644 --- a/sys/dev/drm/mga_dma.c +++ b/sys/dev/drm/mga/mga_dma.c @@ -39,7 +39,7 @@ #include "dev/drm/drm.h" #include "dev/drm/drm_sarea.h" #include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000 #define MGA_FREELIST_DEBUG 0 diff --git a/sys/dev/drm/mga_drv.c b/sys/dev/drm/mga/mga_drv.c similarity index 99% rename from sys/dev/drm/mga_drv.c rename to sys/dev/drm/mga/mga_drv.c index 6654a7b84f..1f965a447c 100644 --- a/sys/dev/drm/mga_drv.c +++ b/sys/dev/drm/mga/mga_drv.c @@ -34,7 +34,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga/mga_drv.h similarity index 100% rename from sys/dev/drm/mga_drv.h rename to sys/dev/drm/mga/mga_drv.h diff --git a/sys/dev/drm/mga_irq.c b/sys/dev/drm/mga/mga_irq.c similarity index 99% rename from sys/dev/drm/mga_irq.c rename to sys/dev/drm/mga/mga_irq.c index 3014d86468..907182369b 100644 --- a/sys/dev/drm/mga_irq.c +++ b/sys/dev/drm/mga/mga_irq.c @@ -34,7 +34,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drv.h" u32 mga_get_vblank_counter(struct drm_device *dev, int crtc) { diff --git a/sys/dev/drm/mga_state.c b/sys/dev/drm/mga/mga_state.c similarity index 99% rename from sys/dev/drm/mga_state.c rename to sys/dev/drm/mga/mga_state.c index 9d9857178a..ccfdff7b9a 100644 --- a/sys/dev/drm/mga_state.c +++ b/sys/dev/drm/mga/mga_state.c @@ -36,7 +36,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drv.h" /* ================================================================ * DMA hardware state programming functions diff --git a/sys/dev/drm/mga_ucode.h b/sys/dev/drm/mga/mga_ucode.h similarity index 100% rename from sys/dev/drm/mga_ucode.h rename to sys/dev/drm/mga/mga_ucode.h diff --git a/sys/dev/drm/mga_warp.c b/sys/dev/drm/mga/mga_warp.c similarity index 99% rename from sys/dev/drm/mga_warp.c rename to sys/dev/drm/mga/mga_warp.c index f7bb011a18..9a7df4d310 100644 --- a/sys/dev/drm/mga_warp.c +++ b/sys/dev/drm/mga/mga_warp.c @@ -31,8 +31,8 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" -#include "dev/drm/mga_ucode.h" +#include "mga_drv.h" +#include "mga_ucode.h" #define MGA_WARP_CODE_ALIGN 256 /* in bytes */ diff --git a/sys/dev/drm/r128/Makefile b/sys/dev/drm/r128/Makefile index eccbb628d9..acf333fff2 100644 --- a/sys/dev/drm/r128/Makefile +++ b/sys/dev/drm/r128/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD = r128 SRCS = r128_cce.c r128_drv.c r128_state.c r128_irq.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS += ${DEBUG_FLAGS} -I. -I.. +CFLAGS += ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/r128 .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/r128_cce.c b/sys/dev/drm/r128/r128_cce.c similarity index 99% rename from sys/dev/drm/r128_cce.c rename to sys/dev/drm/r128/r128_cce.c index c8a2b31f04..e77e4f02df 100644 --- a/sys/dev/drm/r128_cce.c +++ b/sys/dev/drm/r128/r128_cce.c @@ -32,7 +32,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drv.h" #define R128_FIFO_DEBUG 0 diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128/r128_drv.c similarity index 99% rename from sys/dev/drm/r128_drv.c rename to sys/dev/drm/r128/r128_drv.c index 7b17c1462c..864f0ec355 100644 --- a/sys/dev/drm/r128_drv.c +++ b/sys/dev/drm/r128/r128_drv.c @@ -34,7 +34,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128/r128_drv.h similarity index 100% rename from sys/dev/drm/r128_drv.h rename to sys/dev/drm/r128/r128_drv.h diff --git a/sys/dev/drm/r128_irq.c b/sys/dev/drm/r128/r128_irq.c similarity index 99% rename from sys/dev/drm/r128_irq.c rename to sys/dev/drm/r128/r128_irq.c index a4fd946644..05682ded54 100644 --- a/sys/dev/drm/r128_irq.c +++ b/sys/dev/drm/r128/r128_irq.c @@ -33,7 +33,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drv.h" u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) { diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128/r128_state.c similarity index 99% rename from sys/dev/drm/r128_state.c rename to sys/dev/drm/r128/r128_state.c index 0eee4aa309..02189fa4d7 100644 --- a/sys/dev/drm/r128_state.c +++ b/sys/dev/drm/r128/r128_state.c @@ -31,7 +31,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drv.h" /* ================================================================ * CCE hardware state programming functions diff --git a/sys/dev/drm/radeon/Makefile b/sys/dev/drm/radeon/Makefile index 20d12b13e3..adb77e36dd 100644 --- a/sys/dev/drm/radeon/Makefile +++ b/sys/dev/drm/radeon/Makefile @@ -1,9 +1,9 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD = radeon -SRCS = r300_cmdbuf.c r600_cp.c radeon_cp.c radeon_drv.c radeon_state.c \ +SRCS = r300_cmdbuf.c r600_cp.c radeon_cp.c radeon_drv.c radeon_state.c \ radeon_irq.c radeon_mem.c radeon_cs.c r600_blit.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS += ${DEBUG_FLAGS} -I. -I.. +CFLAGS += ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/radeon .if ${CC} != "icc" CFLAGS += --param large-function-growth=1000 diff --git a/sys/dev/drm/r300_cmdbuf.c b/sys/dev/drm/radeon/r300_cmdbuf.c similarity index 99% rename from sys/dev/drm/r300_cmdbuf.c rename to sys/dev/drm/radeon/r300_cmdbuf.c index 8cdaf46d24..732d41174b 100644 --- a/sys/dev/drm/r300_cmdbuf.c +++ b/sys/dev/drm/radeon/r300_cmdbuf.c @@ -34,8 +34,8 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" -#include "dev/drm/r300_reg.h" +#include "radeon_drv.h" +#include "r300_reg.h" #define R300_SIMULTANEOUS_CLIPRECTS 4 diff --git a/sys/dev/drm/r300_reg.h b/sys/dev/drm/radeon/r300_reg.h similarity index 100% rename from sys/dev/drm/r300_reg.h rename to sys/dev/drm/radeon/r300_reg.h diff --git a/sys/dev/drm/r600_blit.c b/sys/dev/drm/radeon/r600_blit.c similarity index 99% rename from sys/dev/drm/r600_blit.c rename to sys/dev/drm/radeon/r600_blit.c index c34427abff..89454212c6 100644 --- a/sys/dev/drm/r600_blit.c +++ b/sys/dev/drm/radeon/r600_blit.c @@ -28,7 +28,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" static u32 r6xx_default_state[] = { diff --git a/sys/dev/drm/r600_cp.c b/sys/dev/drm/radeon/r600_cp.c similarity index 99% rename from sys/dev/drm/r600_cp.c rename to sys/dev/drm/radeon/r600_cp.c index 19d44f5a2e..cb85ab1642 100644 --- a/sys/dev/drm/r600_cp.c +++ b/sys/dev/drm/radeon/r600_cp.c @@ -30,9 +30,9 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" -#include "dev/drm/r600_microcode.h" +#include "r600_microcode.h" # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ # define ATI_PCIGART_PAGE_MASK (~(ATI_PCIGART_PAGE_SIZE-1)) diff --git a/sys/dev/drm/r600_microcode.h b/sys/dev/drm/radeon/r600_microcode.h similarity index 100% rename from sys/dev/drm/r600_microcode.h rename to sys/dev/drm/radeon/r600_microcode.h diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon/radeon_cp.c similarity index 99% rename from sys/dev/drm/radeon_cp.c rename to sys/dev/drm/radeon/radeon_cp.c index ef5cfc8f30..7af3f1592c 100644 --- a/sys/dev/drm/radeon_cp.c +++ b/sys/dev/drm/radeon/radeon_cp.c @@ -33,10 +33,10 @@ #include "dev/drm/drm.h" #include "dev/drm/drm_sarea.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" -#include "dev/drm/r300_reg.h" +#include "radeon_drv.h" +#include "r300_reg.h" -#include "dev/drm/radeon_microcode.h" +#include "radeon_microcode.h" #define RADEON_FIFO_DEBUG 0 diff --git a/sys/dev/drm/radeon_cs.c b/sys/dev/drm/radeon/radeon_cs.c similarity index 99% rename from sys/dev/drm/radeon_cs.c rename to sys/dev/drm/radeon/radeon_cs.c index adc1209440..8a19abf748 100644 --- a/sys/dev/drm/radeon_cs.c +++ b/sys/dev/drm/radeon/radeon_cs.c @@ -28,7 +28,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" /* regs */ #define AVIVO_D1MODE_VLINE_START_END 0x6538 diff --git a/sys/dev/drm/radeon_drv.c b/sys/dev/drm/radeon/radeon_drv.c similarity index 99% rename from sys/dev/drm/radeon_drv.c rename to sys/dev/drm/radeon/radeon_drv.c index df355141ff..892973c6f9 100644 --- a/sys/dev/drm/radeon_drv.c +++ b/sys/dev/drm/radeon/radeon_drv.c @@ -32,7 +32,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" #include "dev/drm/drm_pciids.h" int radeon_no_wb; diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon/radeon_drv.h similarity index 100% rename from sys/dev/drm/radeon_drv.h rename to sys/dev/drm/radeon/radeon_drv.h diff --git a/sys/dev/drm/radeon_irq.c b/sys/dev/drm/radeon/radeon_irq.c similarity index 98% rename from sys/dev/drm/radeon_irq.c rename to sys/dev/drm/radeon/radeon_irq.c index 8165025c69..c25fd3607d 100644 --- a/sys/dev/drm/radeon_irq.c +++ b/sys/dev/drm/radeon/radeon_irq.c @@ -28,13 +28,13 @@ * Authors: * Keith Whitwell * Michel D�zer - * __FBSDID("$FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.16 2009/09/28 22:37:07 rnoland Exp $"); + * __FBSDID("$FreeBSD: src/sys/radeon_irq.c,v 1.16 2009/09/28 22:37:07 rnoland Exp $"); */ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) { diff --git a/sys/dev/drm/radeon_mem.c b/sys/dev/drm/radeon/radeon_mem.c similarity index 99% rename from sys/dev/drm/radeon_mem.c rename to sys/dev/drm/radeon/radeon_mem.c index 0c569db304..ef1878e4b4 100644 --- a/sys/dev/drm/radeon_mem.c +++ b/sys/dev/drm/radeon/radeon_mem.c @@ -32,7 +32,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" /* Very simple allocator for GART memory, working on a static range * already mapped into each client's address space. diff --git a/sys/dev/drm/radeon_microcode.h b/sys/dev/drm/radeon/radeon_microcode.h similarity index 100% rename from sys/dev/drm/radeon_microcode.h rename to sys/dev/drm/radeon/radeon_microcode.h diff --git a/sys/dev/drm/radeon_state.c b/sys/dev/drm/radeon/radeon_state.c similarity index 99% rename from sys/dev/drm/radeon_state.c rename to sys/dev/drm/radeon/radeon_state.c index 2087a21ed0..e15a015ced 100644 --- a/sys/dev/drm/radeon_state.c +++ b/sys/dev/drm/radeon/radeon_state.c @@ -31,7 +31,7 @@ #include "dev/drm/drm.h" #include "dev/drm/drm_sarea.h" #include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drv.h" /* ================================================================ * Helper functions for client state checking and fixup diff --git a/sys/dev/drm/savage/Makefile b/sys/dev/drm/savage/Makefile index de0bd3422a..7a73d125a3 100644 --- a/sys/dev/drm/savage/Makefile +++ b/sys/dev/drm/savage/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD = savage SRCS = savage_bci.c savage_drv.c savage_state.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS += ${DEBUG_FLAGS} -I. -I.. +CFLAGS += ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/savage .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/savage_bci.c b/sys/dev/drm/savage/savage_bci.c similarity index 99% rename from sys/dev/drm/savage_bci.c rename to sys/dev/drm/savage/savage_bci.c index 9dcf4f768b..a1ae0fc096 100644 --- a/sys/dev/drm/savage_bci.c +++ b/sys/dev/drm/savage/savage_bci.c @@ -25,7 +25,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/savage_drm.h" -#include "dev/drm/savage_drv.h" +#include "savage_drv.h" /* Need a long timeout for shadow status updates can take a while * and so can waiting for events when the queue is full. */ diff --git a/sys/dev/drm/savage_drv.c b/sys/dev/drm/savage/savage_drv.c similarity index 99% rename from sys/dev/drm/savage_drv.c rename to sys/dev/drm/savage/savage_drv.c index 2996442066..e8df7c87c2 100644 --- a/sys/dev/drm/savage_drv.c +++ b/sys/dev/drm/savage/savage_drv.c @@ -29,7 +29,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/savage_drm.h" -#include "dev/drm/savage_drv.h" +#include "savage_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/savage_drv.h b/sys/dev/drm/savage/savage_drv.h similarity index 100% rename from sys/dev/drm/savage_drv.h rename to sys/dev/drm/savage/savage_drv.h diff --git a/sys/dev/drm/savage_state.c b/sys/dev/drm/savage/savage_state.c similarity index 99% rename from sys/dev/drm/savage_state.c rename to sys/dev/drm/savage/savage_state.c index ac0bc3de6e..7cf4b87672 100644 --- a/sys/dev/drm/savage_state.c +++ b/sys/dev/drm/savage/savage_state.c @@ -25,7 +25,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/savage_drm.h" -#include "dev/drm/savage_drv.h" +#include "savage_drv.h" void savage_emit_clip_rect_s3d(drm_savage_private_t *dev_priv, const struct drm_clip_rect *pbox) diff --git a/sys/dev/drm/sis/Makefile b/sys/dev/drm/sis/Makefile index f8f1f35700..35c03485f3 100644 --- a/sys/dev/drm/sis/Makefile +++ b/sys/dev/drm/sis/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD= sis SRCS= sis_drv.c sis_ds.c sis_mm.c SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS+= ${DEBUG_FLAGS} -I. -I.. +CFLAGS+= ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/sis .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis/sis_drv.c similarity index 99% rename from sys/dev/drm/sis_drv.c rename to sys/dev/drm/sis/sis_drv.c index d96819e873..39198f4d5a 100644 --- a/sys/dev/drm/sis_drv.c +++ b/sys/dev/drm/sis/sis_drv.c @@ -28,7 +28,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/sis_drm.h" -#include "dev/drm/sis_drv.h" +#include "sis_drv.h" #include "dev/drm/drm_pciids.h" /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ diff --git a/sys/dev/drm/sis_drv.h b/sys/dev/drm/sis/sis_drv.h similarity index 98% rename from sys/dev/drm/sis_drv.h rename to sys/dev/drm/sis/sis_drv.h index 879cc0cef2..1a23289b87 100644 --- a/sys/dev/drm/sis_drv.h +++ b/sys/dev/drm/sis/sis_drv.h @@ -72,7 +72,7 @@ extern void sis_reclaim_buffers_locked(struct drm_device *dev, extern void sis_lastclose(struct drm_device *dev); #else -#include "dev/drm/sis_ds.h" +#include "sis_ds.h" typedef struct drm_sis_private { memHeap_t *AGPHeap; diff --git a/sys/dev/drm/sis_ds.c b/sys/dev/drm/sis/sis_ds.c similarity index 99% rename from sys/dev/drm/sis_ds.c rename to sys/dev/drm/sis/sis_ds.c index 4002ce3458..cdcadc7213 100644 --- a/sys/dev/drm/sis_ds.c +++ b/sys/dev/drm/sis/sis_ds.c @@ -30,7 +30,7 @@ #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/sis_ds.h" +#include "sis_ds.h" /* Set Data Structure, not check repeated value * temporarily used diff --git a/sys/dev/drm/sis_ds.h b/sys/dev/drm/sis/sis_ds.h similarity index 100% rename from sys/dev/drm/sis_ds.h rename to sys/dev/drm/sis/sis_ds.h diff --git a/sys/dev/drm/sis_mm.c b/sys/dev/drm/sis/sis_mm.c similarity index 99% rename from sys/dev/drm/sis_mm.c rename to sys/dev/drm/sis/sis_mm.c index d8a0e0bcae..c081024130 100644 --- a/sys/dev/drm/sis_mm.c +++ b/sys/dev/drm/sis/sis_mm.c @@ -37,8 +37,8 @@ #endif #include "dev/drm/drmP.h" #include "dev/drm/sis_drm.h" -#include "dev/drm/sis_drv.h" -#include "dev/drm/sis_ds.h" +#include "sis_drv.h" +#include "sis_ds.h" #define MAX_CONTEXT 100 #define VIDEO_TYPE 0 diff --git a/sys/dev/drm/tdfx/Makefile b/sys/dev/drm/tdfx/Makefile index 6b068f1157..71b46aa77e 100644 --- a/sys/dev/drm/tdfx/Makefile +++ b/sys/dev/drm/tdfx/Makefile @@ -1,8 +1,8 @@ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR} KMOD= tdfx SRCS= tdfx_drv.c SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h -CFLAGS+= ${DEBUG_FLAGS} -I. -I.. +CFLAGS+= ${DEBUG_FLAGS} -I. -I.. -I@/dev/drm -I@/dev/drm/tdfx .if defined(DRM_DEBUG) DRM_DEBUG_OPT= "\#define DRM_DEBUG 1" diff --git a/sys/dev/drm/tdfx_drv.c b/sys/dev/drm/tdfx/tdfx_drv.c similarity index 99% rename from sys/dev/drm/tdfx_drv.c rename to sys/dev/drm/tdfx/tdfx_drv.c index f204a1fbed..3c8bb423b0 100644 --- a/sys/dev/drm/tdfx_drv.c +++ b/sys/dev/drm/tdfx/tdfx_drv.c @@ -32,7 +32,7 @@ * */ -#include "dev/drm/tdfx_drv.h" +#include "tdfx_drv.h" #include "dev/drm/drmP.h" #include "dev/drm/drm_pciids.h" diff --git a/sys/dev/drm/tdfx_drv.h b/sys/dev/drm/tdfx/tdfx_drv.h similarity index 100% rename from sys/dev/drm/tdfx_drv.h rename to sys/dev/drm/tdfx/tdfx_drv.h -- 2.41.0