drm: Stow drivers for various chip families
authorFrançois Tigeot <ftigeot@wolfpond.org>
Tue, 29 May 2012 21:12:15 +0000 (23:12 +0200)
committerFrançois Tigeot <ftigeot@wolfpond.org>
Wed, 30 May 2012 20:15:11 +0000 (22:15 +0200)
putting them into their own subdirectories in sys/dev/drm/

Inspired-by: David Shao's dflygsocdrm work
57 files changed:
sys/conf/files
sys/dev/drm/i915/Makefile
sys/dev/drm/i915/i915_dma.c [moved from sys/dev/drm/i915_dma.c with 99% similarity]
sys/dev/drm/i915/i915_drv.c [moved from sys/dev/drm/i915_drv.c with 99% similarity]
sys/dev/drm/i915/i915_drv.h [moved from sys/dev/drm/i915_drv.h with 99% similarity]
sys/dev/drm/i915/i915_irq.c [moved from sys/dev/drm/i915_irq.c with 99% similarity]
sys/dev/drm/i915/i915_mem.c [moved from sys/dev/drm/i915_mem.c with 99% similarity]
sys/dev/drm/i915/i915_reg.h [moved from sys/dev/drm/i915_reg.h with 100% similarity]
sys/dev/drm/i915/i915_suspend.c [moved from sys/dev/drm/i915_suspend.c with 99% similarity]
sys/dev/drm/mach64/Makefile
sys/dev/drm/mach64/mach64_dma.c [moved from sys/dev/drm/mach64_dma.c with 99% similarity]
sys/dev/drm/mach64/mach64_drv.c [moved from sys/dev/drm/mach64_drv.c with 99% similarity]
sys/dev/drm/mach64/mach64_drv.h [moved from sys/dev/drm/mach64_drv.h with 100% similarity]
sys/dev/drm/mach64/mach64_irq.c [moved from sys/dev/drm/mach64_irq.c with 99% similarity]
sys/dev/drm/mach64/mach64_state.c [moved from sys/dev/drm/mach64_state.c with 99% similarity]
sys/dev/drm/mga/Makefile
sys/dev/drm/mga/mga_dma.c [moved from sys/dev/drm/mga_dma.c with 99% similarity]
sys/dev/drm/mga/mga_drv.c [moved from sys/dev/drm/mga_drv.c with 99% similarity]
sys/dev/drm/mga/mga_drv.h [moved from sys/dev/drm/mga_drv.h with 100% similarity]
sys/dev/drm/mga/mga_irq.c [moved from sys/dev/drm/mga_irq.c with 99% similarity]
sys/dev/drm/mga/mga_state.c [moved from sys/dev/drm/mga_state.c with 99% similarity]
sys/dev/drm/mga/mga_ucode.h [moved from sys/dev/drm/mga_ucode.h with 100% similarity]
sys/dev/drm/mga/mga_warp.c [moved from sys/dev/drm/mga_warp.c with 99% similarity]
sys/dev/drm/r128/Makefile
sys/dev/drm/r128/r128_cce.c [moved from sys/dev/drm/r128_cce.c with 99% similarity]
sys/dev/drm/r128/r128_drv.c [moved from sys/dev/drm/r128_drv.c with 99% similarity]
sys/dev/drm/r128/r128_drv.h [moved from sys/dev/drm/r128_drv.h with 100% similarity]
sys/dev/drm/r128/r128_irq.c [moved from sys/dev/drm/r128_irq.c with 99% similarity]
sys/dev/drm/r128/r128_state.c [moved from sys/dev/drm/r128_state.c with 99% similarity]
sys/dev/drm/radeon/Makefile
sys/dev/drm/radeon/r300_cmdbuf.c [moved from sys/dev/drm/r300_cmdbuf.c with 99% similarity]
sys/dev/drm/radeon/r300_reg.h [moved from sys/dev/drm/r300_reg.h with 100% similarity]
sys/dev/drm/radeon/r600_blit.c [moved from sys/dev/drm/r600_blit.c with 99% similarity]
sys/dev/drm/radeon/r600_cp.c [moved from sys/dev/drm/r600_cp.c with 99% similarity]
sys/dev/drm/radeon/r600_microcode.h [moved from sys/dev/drm/r600_microcode.h with 100% similarity]
sys/dev/drm/radeon/radeon_cp.c [moved from sys/dev/drm/radeon_cp.c with 99% similarity]
sys/dev/drm/radeon/radeon_cs.c [moved from sys/dev/drm/radeon_cs.c with 99% similarity]
sys/dev/drm/radeon/radeon_drv.c [moved from sys/dev/drm/radeon_drv.c with 99% similarity]
sys/dev/drm/radeon/radeon_drv.h [moved from sys/dev/drm/radeon_drv.h with 100% similarity]
sys/dev/drm/radeon/radeon_irq.c [moved from sys/dev/drm/radeon_irq.c with 98% similarity]
sys/dev/drm/radeon/radeon_mem.c [moved from sys/dev/drm/radeon_mem.c with 99% similarity]
sys/dev/drm/radeon/radeon_microcode.h [moved from sys/dev/drm/radeon_microcode.h with 100% similarity]
sys/dev/drm/radeon/radeon_state.c [moved from sys/dev/drm/radeon_state.c with 99% similarity]
sys/dev/drm/savage/Makefile
sys/dev/drm/savage/savage_bci.c [moved from sys/dev/drm/savage_bci.c with 99% similarity]
sys/dev/drm/savage/savage_drv.c [moved from sys/dev/drm/savage_drv.c with 99% similarity]
sys/dev/drm/savage/savage_drv.h [moved from sys/dev/drm/savage_drv.h with 100% similarity]
sys/dev/drm/savage/savage_state.c [moved from sys/dev/drm/savage_state.c with 99% similarity]
sys/dev/drm/sis/Makefile
sys/dev/drm/sis/sis_drv.c [moved from sys/dev/drm/sis_drv.c with 99% similarity]
sys/dev/drm/sis/sis_drv.h [moved from sys/dev/drm/sis_drv.h with 98% similarity]
sys/dev/drm/sis/sis_ds.c [moved from sys/dev/drm/sis_ds.c with 99% similarity]
sys/dev/drm/sis/sis_ds.h [moved from sys/dev/drm/sis_ds.h with 100% similarity]
sys/dev/drm/sis/sis_mm.c [moved from sys/dev/drm/sis_mm.c with 99% similarity]
sys/dev/drm/tdfx/Makefile
sys/dev/drm/tdfx/tdfx_drv.c [moved from sys/dev/drm/tdfx_drv.c with 99% similarity]
sys/dev/drm/tdfx/tdfx_drv.h [moved from sys/dev/drm/tdfx_drv.h with 100% similarity]

index 50aab19..2cade9b 100644 (file)
@@ -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
index f877407..a52b28b 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/i915_dma.c
rename to sys/dev/drm/i915/i915_dma.c
index 08f91f4..787b0b1 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/i915_drv.c
rename to sys/dev/drm/i915/i915_drv.c
index c9e5461..fbf35f6 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/i915_drv.h
rename to sys/dev/drm/i915/i915_drv.h
index 0669a1b..b6fb528 100644 (file)
@@ -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:
  */
similarity index 99%
rename from sys/dev/drm/i915_irq.c
rename to sys/dev/drm/i915/i915_irq.c
index 44e0008..7ba4187 100644 (file)
@@ -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)
 
similarity index 99%
rename from sys/dev/drm/i915_mem.c
rename to sys/dev/drm/i915/i915_mem.c
index 86111e3..a77ec95 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/i915_suspend.c
rename to sys/dev/drm/i915/i915_suspend.c
index afac3b3..59ea9e3 100644 (file)
@@ -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)
 {
index 9ddba44..17825ce 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/mach64_dma.c
rename to sys/dev/drm/mach64/mach64_dma.c
index c7236d4..9b25abc 100644 (file)
@@ -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 */
similarity index 99%
rename from sys/dev/drm/mach64_drv.c
rename to sys/dev/drm/mach64/mach64_drv.c
index 229fe5b..efbff3f 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/mach64_irq.c
rename to sys/dev/drm/mach64/mach64_irq.c
index fae8897..00e212a 100644 (file)
@@ -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)
 {
similarity index 99%
rename from sys/dev/drm/mach64_state.c
rename to sys/dev/drm/mach64/mach64_state.c
index 186d55e..84d5d54 100644 (file)
@@ -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:
  *
index bc3d444..933adc1 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/mga_dma.c
rename to sys/dev/drm/mga/mga_dma.c
index bec9cb5..7d366c5 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/mga_drv.c
rename to sys/dev/drm/mga/mga_drv.c
index 6654a7b..1f965a4 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/mga_irq.c
rename to sys/dev/drm/mga/mga_irq.c
index 3014d86..9071823 100644 (file)
@@ -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)
 {
similarity index 99%
rename from sys/dev/drm/mga_state.c
rename to sys/dev/drm/mga/mga_state.c
index 9d98571..ccfdff7 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/mga_warp.c
rename to sys/dev/drm/mga/mga_warp.c
index f7bb011..9a7df4d 100644 (file)
@@ -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 */
 
index eccbb62..acf333f 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/r128_cce.c
rename to sys/dev/drm/r128/r128_cce.c
index c8a2b31..e77e4f0 100644 (file)
@@ -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
 
similarity index 99%
rename from sys/dev/drm/r128_drv.c
rename to sys/dev/drm/r128/r128_drv.c
index 7b17c14..864f0ec 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/r128_irq.c
rename to sys/dev/drm/r128/r128_irq.c
index a4fd946..05682de 100644 (file)
@@ -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)
 {
similarity index 99%
rename from sys/dev/drm/r128_state.c
rename to sys/dev/drm/r128/r128_state.c
index 0eee4aa..02189fa 100644 (file)
@@ -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
index 20d12b1..adb77e3 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/r300_cmdbuf.c
rename to sys/dev/drm/radeon/r300_cmdbuf.c
index 8cdaf46..732d411 100644 (file)
@@ -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
 
similarity index 99%
rename from sys/dev/drm/r600_blit.c
rename to sys/dev/drm/radeon/r600_blit.c
index c34427a..8945421 100644 (file)
@@ -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[] =
 {
similarity index 99%
rename from sys/dev/drm/r600_cp.c
rename to sys/dev/drm/radeon/r600_cp.c
index 19d44f5..cb85ab1 100644 (file)
@@ -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))
similarity index 99%
rename from sys/dev/drm/radeon_cp.c
rename to sys/dev/drm/radeon/radeon_cp.c
index ef5cfc8..7af3f15 100644 (file)
 #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
 
similarity index 99%
rename from sys/dev/drm/radeon_cs.c
rename to sys/dev/drm/radeon/radeon_cs.c
index adc1209..8a19abf 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/radeon_drv.c
rename to sys/dev/drm/radeon/radeon_drv.c
index df35514..892973c 100644 (file)
@@ -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;
similarity index 98%
rename from sys/dev/drm/radeon_irq.c
rename to sys/dev/drm/radeon/radeon_irq.c
index 8165025..c25fd36 100644 (file)
  * Authors:
  *    Keith Whitwell <keith@tungstengraphics.com>
  *    Michel D�zer <michel@daenzer.net>
- * __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)
 {
similarity index 99%
rename from sys/dev/drm/radeon_mem.c
rename to sys/dev/drm/radeon/radeon_mem.c
index 0c569db..ef1878e 100644 (file)
@@ -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.
similarity index 99%
rename from sys/dev/drm/radeon_state.c
rename to sys/dev/drm/radeon/radeon_state.c
index 2087a21..e15a015 100644 (file)
@@ -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
index de0bd34..7a73d12 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/savage_bci.c
rename to sys/dev/drm/savage/savage_bci.c
index 9dcf4f7..a1ae0fc 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/savage_drv.c
rename to sys/dev/drm/savage/savage_drv.c
index 2996442..e8df7c8 100644 (file)
@@ -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. */
similarity index 99%
rename from sys/dev/drm/savage_state.c
rename to sys/dev/drm/savage/savage_state.c
index ac0bc3d..7cf4b87 100644 (file)
@@ -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)
index f8f1f35..35c0348 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/sis_drv.c
rename to sys/dev/drm/sis/sis_drv.c
index d96819e..39198f4 100644 (file)
@@ -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. */
similarity index 98%
rename from sys/dev/drm/sis_drv.h
rename to sys/dev/drm/sis/sis_drv.h
index 879cc0c..1a23289 100644 (file)
@@ -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;
similarity index 99%
rename from sys/dev/drm/sis_ds.c
rename to sys/dev/drm/sis/sis_ds.c
index 4002ce3..cdcadc7 100644 (file)
@@ -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
similarity index 99%
rename from sys/dev/drm/sis_mm.c
rename to sys/dev/drm/sis/sis_mm.c
index d8a0e0b..c081024 100644 (file)
@@ -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
index 6b068f1..71b46aa 100644 (file)
@@ -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"
similarity index 99%
rename from sys/dev/drm/tdfx_drv.c
rename to sys/dev/drm/tdfx/tdfx_drv.c
index f204a1f..3c8bb42 100644 (file)
@@ -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"