Merge branch 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/airlied/drm-2.6 * 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: reorganise drm tree to be more future proof.
mariux64 · Jul 14, 2008 · c142bda · c142bda
2 parents b5cf43c + c0e0920
commit c142bda
Show file tree

Hide file tree

Showing 120 changed files with 132 additions and 42 deletions.
diff --git a/drivers/Makefile b/drivers/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_PCI)		+= pci/
 obj-$(CONFIG_PARISC)		+= parisc/
 obj-$(CONFIG_RAPIDIO)		+= rapidio/
 obj-y				+= video/
+obj-y				+= gpu/
 obj-$(CONFIG_ACPI)		+= acpi/
 # PnP must come after ACPI since it will eventually need to check if acpi
 # was used and do nothing if so

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
@@ -101,7 +101,6 @@ obj-$(CONFIG_TELCLOCK)		+= tlclk.o
 
 obj-$(CONFIG_MWAVE)		+= mwave/
 obj-$(CONFIG_AGP)		+= agp/
-obj-$(CONFIG_DRM)		+= drm/
 obj-$(CONFIG_PCMCIA)		+= pcmcia/
 obj-$(CONFIG_IPMI_HANDLER)	+= ipmi/
 

diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
@@ -0,0 +1 @@
+obj-y			+= drm/
diff --git a/drivers/char/drm/Kconfig → drivers/gpu/drm/Kconfig b/drivers/char/drm/Kconfig → drivers/gpu/drm/Kconfig
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
@@ -0,0 +1,26 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+
+drm-y       :=	drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
+		drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \
+		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
+		drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
+		drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
+
+drm-$(CONFIG_COMPAT) += drm_ioc32.o
+
+obj-$(CONFIG_DRM)	+= drm.o
+obj-$(CONFIG_DRM_TDFX)	+= tdfx/
+obj-$(CONFIG_DRM_R128)	+= r128/
+obj-$(CONFIG_DRM_RADEON)+= radeon/
+obj-$(CONFIG_DRM_MGA)	+= mga/
+obj-$(CONFIG_DRM_I810)	+= i810/
+obj-$(CONFIG_DRM_I830)	+= i830/
+obj-$(CONFIG_DRM_I915)  += i915/
+obj-$(CONFIG_DRM_SIS)   += sis/
+obj-$(CONFIG_DRM_SAVAGE)+= savage/
+obj-$(CONFIG_DRM_VIA)	+=via/
+
diff --git a/drivers/char/drm/README.drm → drivers/gpu/drm/README.drm b/drivers/char/drm/README.drm → drivers/gpu/drm/README.drm
diff --git a/drivers/char/drm/ati_pcigart.c → drivers/gpu/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c → drivers/gpu/drm/ati_pcigart.c
diff --git a/drivers/char/drm/drm_agpsupport.c → drivers/gpu/drm/drm_agpsupport.c b/drivers/char/drm/drm_agpsupport.c → drivers/gpu/drm/drm_agpsupport.c
diff --git a/drivers/char/drm/drm_auth.c → drivers/gpu/drm/drm_auth.c b/drivers/char/drm/drm_auth.c → drivers/gpu/drm/drm_auth.c
diff --git a/drivers/char/drm/drm_bufs.c → drivers/gpu/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c → drivers/gpu/drm/drm_bufs.c
diff --git a/drivers/char/drm/drm_context.c → drivers/gpu/drm/drm_context.c b/drivers/char/drm/drm_context.c → drivers/gpu/drm/drm_context.c
diff --git a/drivers/char/drm/drm_dma.c → drivers/gpu/drm/drm_dma.c b/drivers/char/drm/drm_dma.c → drivers/gpu/drm/drm_dma.c
diff --git a/drivers/char/drm/drm_drawable.c → drivers/gpu/drm/drm_drawable.c b/drivers/char/drm/drm_drawable.c → drivers/gpu/drm/drm_drawable.c
diff --git a/drivers/char/drm/drm_drv.c → drivers/gpu/drm/drm_drv.c b/drivers/char/drm/drm_drv.c → drivers/gpu/drm/drm_drv.c
diff --git a/drivers/char/drm/drm_fops.c → drivers/gpu/drm/drm_fops.c b/drivers/char/drm/drm_fops.c → drivers/gpu/drm/drm_fops.c
diff --git a/drivers/char/drm/drm_hashtab.c → drivers/gpu/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c → drivers/gpu/drm/drm_hashtab.c
diff --git a/drivers/char/drm/drm_ioc32.c → drivers/gpu/drm/drm_ioc32.c b/drivers/char/drm/drm_ioc32.c → drivers/gpu/drm/drm_ioc32.c
diff --git a/drivers/char/drm/drm_ioctl.c → drivers/gpu/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c → drivers/gpu/drm/drm_ioctl.c
diff --git a/drivers/char/drm/drm_irq.c → drivers/gpu/drm/drm_irq.c b/drivers/char/drm/drm_irq.c → drivers/gpu/drm/drm_irq.c
diff --git a/drivers/char/drm/drm_lock.c → drivers/gpu/drm/drm_lock.c b/drivers/char/drm/drm_lock.c → drivers/gpu/drm/drm_lock.c
diff --git a/drivers/char/drm/drm_memory.c → drivers/gpu/drm/drm_memory.c b/drivers/char/drm/drm_memory.c → drivers/gpu/drm/drm_memory.c
diff --git a/drivers/char/drm/drm_mm.c → drivers/gpu/drm/drm_mm.c b/drivers/char/drm/drm_mm.c → drivers/gpu/drm/drm_mm.c
diff --git a/drivers/char/drm/drm_pci.c → drivers/gpu/drm/drm_pci.c b/drivers/char/drm/drm_pci.c → drivers/gpu/drm/drm_pci.c
diff --git a/drivers/char/drm/drm_proc.c → drivers/gpu/drm/drm_proc.c b/drivers/char/drm/drm_proc.c → drivers/gpu/drm/drm_proc.c
diff --git a/drivers/char/drm/drm_scatter.c → drivers/gpu/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c → drivers/gpu/drm/drm_scatter.c
diff --git a/drivers/char/drm/drm_sman.c → drivers/gpu/drm/drm_sman.c b/drivers/char/drm/drm_sman.c → drivers/gpu/drm/drm_sman.c
diff --git a/drivers/char/drm/drm_stub.c → drivers/gpu/drm/drm_stub.c b/drivers/char/drm/drm_stub.c → drivers/gpu/drm/drm_stub.c
diff --git a/drivers/char/drm/drm_sysfs.c → drivers/gpu/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c → drivers/gpu/drm/drm_sysfs.c
diff --git a/drivers/char/drm/drm_vm.c → drivers/gpu/drm/drm_vm.c b/drivers/char/drm/drm_vm.c → drivers/gpu/drm/drm_vm.c
diff --git a/drivers/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i810-y := i810_drv.o i810_dma.o
+
+obj-$(CONFIG_DRM_I810)	+= i810.o
diff --git a/drivers/char/drm/i810_dma.c → drivers/gpu/drm/i810/i810_dma.c b/drivers/char/drm/i810_dma.c → drivers/gpu/drm/i810/i810_dma.c
diff --git a/drivers/char/drm/i810_drv.c → drivers/gpu/drm/i810/i810_drv.c b/drivers/char/drm/i810_drv.c → drivers/gpu/drm/i810/i810_drv.c
diff --git a/drivers/char/drm/i810_drv.h → drivers/gpu/drm/i810/i810_drv.h b/drivers/char/drm/i810_drv.h → drivers/gpu/drm/i810/i810_drv.h
diff --git a/drivers/gpu/drm/i830/Makefile b/drivers/gpu/drm/i830/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i830-y := i830_drv.o i830_dma.o i830_irq.o
+
+obj-$(CONFIG_DRM_I830) += i830.o
diff --git a/drivers/char/drm/i830_dma.c → drivers/gpu/drm/i830/i830_dma.c b/drivers/char/drm/i830_dma.c → drivers/gpu/drm/i830/i830_dma.c
diff --git a/drivers/char/drm/i830_drv.c → drivers/gpu/drm/i830/i830_drv.c b/drivers/char/drm/i830_drv.c → drivers/gpu/drm/i830/i830_drv.c
diff --git a/drivers/char/drm/i830_drv.h → drivers/gpu/drm/i830/i830_drv.h b/drivers/char/drm/i830_drv.h → drivers/gpu/drm/i830/i830_drv.h
diff --git a/drivers/char/drm/i830_irq.c → drivers/gpu/drm/i830/i830_irq.c b/drivers/char/drm/i830_irq.c → drivers/gpu/drm/i830/i830_irq.c
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
+
+i915-$(CONFIG_COMPAT)   += i915_ioc32.o
+
+obj-$(CONFIG_DRM_I915)  += i915.o
diff --git a/drivers/char/drm/i915_dma.c → drivers/gpu/drm/i915/i915_dma.c b/drivers/char/drm/i915_dma.c → drivers/gpu/drm/i915/i915_dma.c
diff --git a/drivers/char/drm/i915_drv.c → drivers/gpu/drm/i915/i915_drv.c b/drivers/char/drm/i915_drv.c → drivers/gpu/drm/i915/i915_drv.c
diff --git a/drivers/char/drm/i915_drv.h → drivers/gpu/drm/i915/i915_drv.h b/drivers/char/drm/i915_drv.h → drivers/gpu/drm/i915/i915_drv.h
diff --git a/drivers/char/drm/i915_ioc32.c → drivers/gpu/drm/i915/i915_ioc32.c b/drivers/char/drm/i915_ioc32.c → drivers/gpu/drm/i915/i915_ioc32.c
diff --git a/drivers/char/drm/i915_irq.c → drivers/gpu/drm/i915/i915_irq.c b/drivers/char/drm/i915_irq.c → drivers/gpu/drm/i915/i915_irq.c
diff --git a/drivers/char/drm/i915_mem.c → drivers/gpu/drm/i915/i915_mem.c b/drivers/char/drm/i915_mem.c → drivers/gpu/drm/i915/i915_mem.c
diff --git a/drivers/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile
@@ -0,0 +1,11 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+mga-y := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
+
+mga-$(CONFIG_COMPAT) += mga_ioc32.o
+
+obj-$(CONFIG_DRM_MGA)	+= mga.o
+
diff --git a/drivers/char/drm/mga_dma.c → drivers/gpu/drm/mga/mga_dma.c b/drivers/char/drm/mga_dma.c → drivers/gpu/drm/mga/mga_dma.c
diff --git a/drivers/char/drm/mga_drv.c → drivers/gpu/drm/mga/mga_drv.c b/drivers/char/drm/mga_drv.c → drivers/gpu/drm/mga/mga_drv.c
diff --git a/drivers/char/drm/mga_drv.h → drivers/gpu/drm/mga/mga_drv.h b/drivers/char/drm/mga_drv.h → drivers/gpu/drm/mga/mga_drv.h
diff --git a/drivers/char/drm/mga_ioc32.c → drivers/gpu/drm/mga/mga_ioc32.c b/drivers/char/drm/mga_ioc32.c → drivers/gpu/drm/mga/mga_ioc32.c
diff --git a/drivers/char/drm/mga_irq.c → drivers/gpu/drm/mga/mga_irq.c b/drivers/char/drm/mga_irq.c → drivers/gpu/drm/mga/mga_irq.c
diff --git a/drivers/char/drm/mga_state.c → drivers/gpu/drm/mga/mga_state.c b/drivers/char/drm/mga_state.c → drivers/gpu/drm/mga/mga_state.c
diff --git a/drivers/char/drm/mga_ucode.h → drivers/gpu/drm/mga/mga_ucode.h b/drivers/char/drm/mga_ucode.h → drivers/gpu/drm/mga/mga_ucode.h
diff --git a/drivers/char/drm/mga_warp.c → drivers/gpu/drm/mga/mga_warp.c b/drivers/char/drm/mga_warp.c → drivers/gpu/drm/mga/mga_warp.c
diff --git a/drivers/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
+
+r128-$(CONFIG_COMPAT)   += r128_ioc32.o
+
+obj-$(CONFIG_DRM_R128)	+= r128.o
diff --git a/drivers/char/drm/r128_cce.c → drivers/gpu/drm/r128/r128_cce.c b/drivers/char/drm/r128_cce.c → drivers/gpu/drm/r128/r128_cce.c
diff --git a/drivers/char/drm/r128_drv.c → drivers/gpu/drm/r128/r128_drv.c b/drivers/char/drm/r128_drv.c → drivers/gpu/drm/r128/r128_drv.c
diff --git a/drivers/char/drm/r128_drv.h → drivers/gpu/drm/r128/r128_drv.h b/drivers/char/drm/r128_drv.h → drivers/gpu/drm/r128/r128_drv.h
diff --git a/drivers/char/drm/r128_ioc32.c → drivers/gpu/drm/r128/r128_ioc32.c b/drivers/char/drm/r128_ioc32.c → drivers/gpu/drm/r128/r128_ioc32.c
diff --git a/drivers/char/drm/r128_irq.c → drivers/gpu/drm/r128/r128_irq.c b/drivers/char/drm/r128_irq.c → drivers/gpu/drm/r128/r128_irq.c
diff --git a/drivers/char/drm/r128_state.c → drivers/gpu/drm/r128/r128_state.c b/drivers/char/drm/r128_state.c → drivers/gpu/drm/r128/r128_state.c
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
+
+radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
+
+obj-$(CONFIG_DRM_RADEON)+= radeon.o
diff --git a/drivers/char/drm/r300_cmdbuf.c → drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c → drivers/gpu/drm/radeon/r300_cmdbuf.c
diff --git a/drivers/char/drm/r300_reg.h → drivers/gpu/drm/radeon/r300_reg.h b/drivers/char/drm/r300_reg.h → drivers/gpu/drm/radeon/r300_reg.h
diff --git a/drivers/char/drm/radeon_cp.c → drivers/gpu/drm/radeon/radeon_cp.c b/drivers/char/drm/radeon_cp.c → drivers/gpu/drm/radeon/radeon_cp.c
diff --git a/drivers/char/drm/radeon_drv.c → drivers/gpu/drm/radeon/radeon_drv.c b/drivers/char/drm/radeon_drv.c → drivers/gpu/drm/radeon/radeon_drv.c
diff --git a/drivers/char/drm/radeon_drv.h → drivers/gpu/drm/radeon/radeon_drv.h b/drivers/char/drm/radeon_drv.h → drivers/gpu/drm/radeon/radeon_drv.h
diff --git a/drivers/char/drm/radeon_ioc32.c → drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/char/drm/radeon_ioc32.c → drivers/gpu/drm/radeon/radeon_ioc32.c
diff --git a/drivers/char/drm/radeon_irq.c → drivers/gpu/drm/radeon/radeon_irq.c b/drivers/char/drm/radeon_irq.c → drivers/gpu/drm/radeon/radeon_irq.c
diff --git a/drivers/char/drm/radeon_mem.c → drivers/gpu/drm/radeon/radeon_mem.c b/drivers/char/drm/radeon_mem.c → drivers/gpu/drm/radeon/radeon_mem.c
diff --git a/drivers/char/drm/radeon_microcode.h → drivers/gpu/drm/radeon/radeon_microcode.h b/drivers/char/drm/radeon_microcode.h → drivers/gpu/drm/radeon/radeon_microcode.h
diff --git a/drivers/char/drm/radeon_state.c → drivers/gpu/drm/radeon/radeon_state.c b/drivers/char/drm/radeon_state.c → drivers/gpu/drm/radeon/radeon_state.c
diff --git a/drivers/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y = -Iinclude/drm
+savage-y := savage_drv.o savage_bci.o savage_state.o
+
+obj-$(CONFIG_DRM_SAVAGE)+= savage.o
+
diff --git a/drivers/char/drm/savage_bci.c → drivers/gpu/drm/savage/savage_bci.c b/drivers/char/drm/savage_bci.c → drivers/gpu/drm/savage/savage_bci.c
diff --git a/drivers/char/drm/savage_drv.c → drivers/gpu/drm/savage/savage_drv.c b/drivers/char/drm/savage_drv.c → drivers/gpu/drm/savage/savage_drv.c
diff --git a/drivers/char/drm/savage_drv.h → drivers/gpu/drm/savage/savage_drv.h b/drivers/char/drm/savage_drv.h → drivers/gpu/drm/savage/savage_drv.h
diff --git a/drivers/char/drm/savage_state.c → drivers/gpu/drm/savage/savage_state.c b/drivers/char/drm/savage_state.c → drivers/gpu/drm/savage/savage_state.c
diff --git a/drivers/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y = -Iinclude/drm
+sis-y := sis_drv.o sis_mm.o
+
+obj-$(CONFIG_DRM_SIS)   += sis.o
+
+
diff --git a/drivers/char/drm/sis_drv.c → drivers/gpu/drm/sis/sis_drv.c b/drivers/char/drm/sis_drv.c → drivers/gpu/drm/sis/sis_drv.c
diff --git a/drivers/char/drm/sis_drv.h → drivers/gpu/drm/sis/sis_drv.h b/drivers/char/drm/sis_drv.h → drivers/gpu/drm/sis/sis_drv.h
diff --git a/drivers/char/drm/sis_mm.c → drivers/gpu/drm/sis/sis_mm.c b/drivers/char/drm/sis_mm.c → drivers/gpu/drm/sis/sis_mm.c
diff --git a/drivers/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+tdfx-y := tdfx_drv.o
+
+obj-$(CONFIG_DRM_TDFX)	+= tdfx.o
diff --git a/drivers/char/drm/tdfx_drv.c → drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/char/drm/tdfx_drv.c → drivers/gpu/drm/tdfx/tdfx_drv.c
diff --git a/drivers/char/drm/tdfx_drv.h → drivers/gpu/drm/tdfx/tdfx_drv.h b/drivers/char/drm/tdfx_drv.h → drivers/gpu/drm/tdfx/tdfx_drv.h
diff --git a/drivers/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+ccflags-y := -Iinclude/drm
+via-y    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
+
+obj-$(CONFIG_DRM_VIA)	+=via.o
diff --git a/drivers/char/drm/via_3d_reg.h → drivers/gpu/drm/via/via_3d_reg.h b/drivers/char/drm/via_3d_reg.h → drivers/gpu/drm/via/via_3d_reg.h
diff --git a/drivers/char/drm/via_dma.c → drivers/gpu/drm/via/via_dma.c b/drivers/char/drm/via_dma.c → drivers/gpu/drm/via/via_dma.c
diff --git a/drivers/char/drm/via_dmablit.c → drivers/gpu/drm/via/via_dmablit.c b/drivers/char/drm/via_dmablit.c → drivers/gpu/drm/via/via_dmablit.c
diff --git a/drivers/char/drm/via_dmablit.h → drivers/gpu/drm/via/via_dmablit.h b/drivers/char/drm/via_dmablit.h → drivers/gpu/drm/via/via_dmablit.h
diff --git a/drivers/char/drm/via_drv.c → drivers/gpu/drm/via/via_drv.c b/drivers/char/drm/via_drv.c → drivers/gpu/drm/via/via_drv.c
diff --git a/drivers/char/drm/via_drv.h → drivers/gpu/drm/via/via_drv.h b/drivers/char/drm/via_drv.h → drivers/gpu/drm/via/via_drv.h
diff --git a/drivers/char/drm/via_irq.c → drivers/gpu/drm/via/via_irq.c b/drivers/char/drm/via_irq.c → drivers/gpu/drm/via/via_irq.c
diff --git a/drivers/char/drm/via_map.c → drivers/gpu/drm/via/via_map.c b/drivers/char/drm/via_map.c → drivers/gpu/drm/via/via_map.c
diff --git a/drivers/char/drm/via_mm.c → drivers/gpu/drm/via/via_mm.c b/drivers/char/drm/via_mm.c → drivers/gpu/drm/via/via_mm.c
diff --git a/drivers/char/drm/via_verifier.c → drivers/gpu/drm/via/via_verifier.c b/drivers/char/drm/via_verifier.c → drivers/gpu/drm/via/via_verifier.c
diff --git a/drivers/char/drm/via_verifier.h → drivers/gpu/drm/via/via_verifier.h b/drivers/char/drm/via_verifier.h → drivers/gpu/drm/via/via_verifier.h
diff --git a/drivers/char/drm/via_video.c → drivers/gpu/drm/via/via_video.c b/drivers/char/drm/via_video.c → drivers/gpu/drm/via/via_video.c
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
@@ -7,7 +7,7 @@ menu "Graphics support"
 
 source "drivers/char/agp/Kconfig"
 
-source "drivers/char/drm/Kconfig"
+source "drivers/gpu/drm/Kconfig"
 
 config VGASTATE
        tristate

diff --git a/include/Kbuild b/include/Kbuild
@@ -4,5 +4,6 @@ header-y += sound/
 header-y += mtd/
 header-y += rdma/
 header-y += video/
+header-y += drm/
 
 header-y += asm-$(ARCH)/
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
@@ -0,0 +1,10 @@
+unifdef-y += drm.h drm_sarea.h
+unifdef-y += i810_drm.h
+unifdef-y += i830_drm.h
+unifdef-y += i915_drm.h
+unifdef-y += mga_drm.h
+unifdef-y += r128_drm.h
+unifdef-y += radeon_drm.h
+unifdef-y += sis_drm.h
+unifdef-y += savage_drm.h
+unifdef-y += via_drm.h
diff --git a/drivers/char/drm/drm.h → include/drm/drm.h b/drivers/char/drm/drm.h → include/drm/drm.h
diff --git a/drivers/char/drm/drmP.h → include/drm/drmP.h b/drivers/char/drm/drmP.h → include/drm/drmP.h
diff --git a/drivers/char/drm/drm_core.h → include/drm/drm_core.h b/drivers/char/drm/drm_core.h → include/drm/drm_core.h
diff --git a/drivers/char/drm/drm_hashtab.h → include/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h → include/drm/drm_hashtab.h
diff --git a/drivers/char/drm/drm_memory.h → include/drm/drm_memory.h b/drivers/char/drm/drm_memory.h → include/drm/drm_memory.h
diff --git a/drivers/char/drm/drm_memory_debug.h → include/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h → include/drm/drm_memory_debug.h
diff --git a/drivers/char/drm/drm_os_linux.h → include/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h → include/drm/drm_os_linux.h
diff --git a/drivers/char/drm/drm_pciids.h → include/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h → include/drm/drm_pciids.h
diff --git a/drivers/char/drm/drm_sarea.h → include/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h → include/drm/drm_sarea.h
diff --git a/drivers/char/drm/drm_sman.h → include/drm/drm_sman.h b/drivers/char/drm/drm_sman.h → include/drm/drm_sman.h
diff --git a/drivers/char/drm/i810_drm.h → include/drm/i810_drm.h b/drivers/char/drm/i810_drm.h → include/drm/i810_drm.h
diff --git a/drivers/char/drm/i830_drm.h → include/drm/i830_drm.h b/drivers/char/drm/i830_drm.h → include/drm/i830_drm.h
diff --git a/drivers/char/drm/i915_drm.h → include/drm/i915_drm.h b/drivers/char/drm/i915_drm.h → include/drm/i915_drm.h
diff --git a/drivers/char/drm/mga_drm.h → include/drm/mga_drm.h b/drivers/char/drm/mga_drm.h → include/drm/mga_drm.h
diff --git a/drivers/char/drm/r128_drm.h → include/drm/r128_drm.h b/drivers/char/drm/r128_drm.h → include/drm/r128_drm.h
diff --git a/drivers/char/drm/radeon_drm.h → include/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h → include/drm/radeon_drm.h
diff --git a/drivers/char/drm/savage_drm.h → include/drm/savage_drm.h b/drivers/char/drm/savage_drm.h → include/drm/savage_drm.h
diff --git a/drivers/char/drm/sis_drm.h → include/drm/sis_drm.h b/drivers/char/drm/sis_drm.h → include/drm/sis_drm.h
diff --git a/drivers/char/drm/via_drm.h → include/drm/via_drm.h b/drivers/char/drm/via_drm.h → include/drm/via_drm.h