]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm: reorganise drm tree to be more future proof.
authorDave Airlie <airlied@redhat.com>
Thu, 29 May 2008 00:09:59 +0000 (10:09 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 14 Jul 2008 00:45:01 +0000 (10:45 +1000)
With the coming of kernel based modesetting and the memory manager stuff,
the everything in one directory approach was getting very ugly and
starting to be unmanageable.

This restructures the drm along the lines of other kernel components.

It creates a drivers/gpu/drm directory and moves the hw drivers into
subdirectores. It moves the includes into an include/drm, and
sets up the unifdef for the userspace headers we should be exporting.

Signed-off-by: Dave Airlie <airlied@redhat.com>
120 files changed:
drivers/Makefile
drivers/char/Makefile
drivers/char/drm/Makefile [deleted file]
drivers/gpu/Makefile [new file with mode: 0644]
drivers/gpu/drm/Kconfig [moved from drivers/char/drm/Kconfig with 100% similarity]
drivers/gpu/drm/Makefile [new file with mode: 0644]
drivers/gpu/drm/README.drm [moved from drivers/char/drm/README.drm with 100% similarity]
drivers/gpu/drm/ati_pcigart.c [moved from drivers/char/drm/ati_pcigart.c with 100% similarity]
drivers/gpu/drm/drm_agpsupport.c [moved from drivers/char/drm/drm_agpsupport.c with 100% similarity]
drivers/gpu/drm/drm_auth.c [moved from drivers/char/drm/drm_auth.c with 100% similarity]
drivers/gpu/drm/drm_bufs.c [moved from drivers/char/drm/drm_bufs.c with 100% similarity]
drivers/gpu/drm/drm_context.c [moved from drivers/char/drm/drm_context.c with 100% similarity]
drivers/gpu/drm/drm_dma.c [moved from drivers/char/drm/drm_dma.c with 100% similarity]
drivers/gpu/drm/drm_drawable.c [moved from drivers/char/drm/drm_drawable.c with 100% similarity]
drivers/gpu/drm/drm_drv.c [moved from drivers/char/drm/drm_drv.c with 100% similarity]
drivers/gpu/drm/drm_fops.c [moved from drivers/char/drm/drm_fops.c with 100% similarity]
drivers/gpu/drm/drm_hashtab.c [moved from drivers/char/drm/drm_hashtab.c with 100% similarity]
drivers/gpu/drm/drm_ioc32.c [moved from drivers/char/drm/drm_ioc32.c with 100% similarity]
drivers/gpu/drm/drm_ioctl.c [moved from drivers/char/drm/drm_ioctl.c with 100% similarity]
drivers/gpu/drm/drm_irq.c [moved from drivers/char/drm/drm_irq.c with 100% similarity]
drivers/gpu/drm/drm_lock.c [moved from drivers/char/drm/drm_lock.c with 100% similarity]
drivers/gpu/drm/drm_memory.c [moved from drivers/char/drm/drm_memory.c with 100% similarity]
drivers/gpu/drm/drm_mm.c [moved from drivers/char/drm/drm_mm.c with 100% similarity]
drivers/gpu/drm/drm_pci.c [moved from drivers/char/drm/drm_pci.c with 100% similarity]
drivers/gpu/drm/drm_proc.c [moved from drivers/char/drm/drm_proc.c with 100% similarity]
drivers/gpu/drm/drm_scatter.c [moved from drivers/char/drm/drm_scatter.c with 100% similarity]
drivers/gpu/drm/drm_sman.c [moved from drivers/char/drm/drm_sman.c with 100% similarity]
drivers/gpu/drm/drm_stub.c [moved from drivers/char/drm/drm_stub.c with 100% similarity]
drivers/gpu/drm/drm_sysfs.c [moved from drivers/char/drm/drm_sysfs.c with 100% similarity]
drivers/gpu/drm/drm_vm.c [moved from drivers/char/drm/drm_vm.c with 100% similarity]
drivers/gpu/drm/i810/Makefile [new file with mode: 0644]
drivers/gpu/drm/i810/i810_dma.c [moved from drivers/char/drm/i810_dma.c with 100% similarity]
drivers/gpu/drm/i810/i810_drv.c [moved from drivers/char/drm/i810_drv.c with 100% similarity]
drivers/gpu/drm/i810/i810_drv.h [moved from drivers/char/drm/i810_drv.h with 100% similarity]
drivers/gpu/drm/i830/Makefile [new file with mode: 0644]
drivers/gpu/drm/i830/i830_dma.c [moved from drivers/char/drm/i830_dma.c with 100% similarity]
drivers/gpu/drm/i830/i830_drv.c [moved from drivers/char/drm/i830_drv.c with 100% similarity]
drivers/gpu/drm/i830/i830_drv.h [moved from drivers/char/drm/i830_drv.h with 100% similarity]
drivers/gpu/drm/i830/i830_irq.c [moved from drivers/char/drm/i830_irq.c with 100% similarity]
drivers/gpu/drm/i915/Makefile [new file with mode: 0644]
drivers/gpu/drm/i915/i915_dma.c [moved from drivers/char/drm/i915_dma.c with 100% similarity]
drivers/gpu/drm/i915/i915_drv.c [moved from drivers/char/drm/i915_drv.c with 100% similarity]
drivers/gpu/drm/i915/i915_drv.h [moved from drivers/char/drm/i915_drv.h with 100% similarity]
drivers/gpu/drm/i915/i915_ioc32.c [moved from drivers/char/drm/i915_ioc32.c with 100% similarity]
drivers/gpu/drm/i915/i915_irq.c [moved from drivers/char/drm/i915_irq.c with 100% similarity]
drivers/gpu/drm/i915/i915_mem.c [moved from drivers/char/drm/i915_mem.c with 100% similarity]
drivers/gpu/drm/mga/Makefile [new file with mode: 0644]
drivers/gpu/drm/mga/mga_dma.c [moved from drivers/char/drm/mga_dma.c with 100% similarity]
drivers/gpu/drm/mga/mga_drv.c [moved from drivers/char/drm/mga_drv.c with 100% similarity]
drivers/gpu/drm/mga/mga_drv.h [moved from drivers/char/drm/mga_drv.h with 100% similarity]
drivers/gpu/drm/mga/mga_ioc32.c [moved from drivers/char/drm/mga_ioc32.c with 100% similarity]
drivers/gpu/drm/mga/mga_irq.c [moved from drivers/char/drm/mga_irq.c with 100% similarity]
drivers/gpu/drm/mga/mga_state.c [moved from drivers/char/drm/mga_state.c with 100% similarity]
drivers/gpu/drm/mga/mga_ucode.h [moved from drivers/char/drm/mga_ucode.h with 100% similarity]
drivers/gpu/drm/mga/mga_warp.c [moved from drivers/char/drm/mga_warp.c with 100% similarity]
drivers/gpu/drm/r128/Makefile [new file with mode: 0644]
drivers/gpu/drm/r128/r128_cce.c [moved from drivers/char/drm/r128_cce.c with 100% similarity]
drivers/gpu/drm/r128/r128_drv.c [moved from drivers/char/drm/r128_drv.c with 100% similarity]
drivers/gpu/drm/r128/r128_drv.h [moved from drivers/char/drm/r128_drv.h with 100% similarity]
drivers/gpu/drm/r128/r128_ioc32.c [moved from drivers/char/drm/r128_ioc32.c with 100% similarity]
drivers/gpu/drm/r128/r128_irq.c [moved from drivers/char/drm/r128_irq.c with 100% similarity]
drivers/gpu/drm/r128/r128_state.c [moved from drivers/char/drm/r128_state.c with 100% similarity]
drivers/gpu/drm/radeon/Makefile [new file with mode: 0644]
drivers/gpu/drm/radeon/r300_cmdbuf.c [moved from drivers/char/drm/r300_cmdbuf.c with 100% similarity]
drivers/gpu/drm/radeon/r300_reg.h [moved from drivers/char/drm/r300_reg.h with 100% similarity]
drivers/gpu/drm/radeon/radeon_cp.c [moved from drivers/char/drm/radeon_cp.c with 100% similarity]
drivers/gpu/drm/radeon/radeon_drv.c [moved from drivers/char/drm/radeon_drv.c with 100% similarity]
drivers/gpu/drm/radeon/radeon_drv.h [moved from drivers/char/drm/radeon_drv.h with 100% similarity]
drivers/gpu/drm/radeon/radeon_ioc32.c [moved from drivers/char/drm/radeon_ioc32.c with 100% similarity]
drivers/gpu/drm/radeon/radeon_irq.c [moved from drivers/char/drm/radeon_irq.c with 100% similarity]
drivers/gpu/drm/radeon/radeon_mem.c [moved from drivers/char/drm/radeon_mem.c with 100% similarity]
drivers/gpu/drm/radeon/radeon_microcode.h [moved from drivers/char/drm/radeon_microcode.h with 100% similarity]
drivers/gpu/drm/radeon/radeon_state.c [moved from drivers/char/drm/radeon_state.c with 100% similarity]
drivers/gpu/drm/savage/Makefile [new file with mode: 0644]
drivers/gpu/drm/savage/savage_bci.c [moved from drivers/char/drm/savage_bci.c with 100% similarity]
drivers/gpu/drm/savage/savage_drv.c [moved from drivers/char/drm/savage_drv.c with 100% similarity]
drivers/gpu/drm/savage/savage_drv.h [moved from drivers/char/drm/savage_drv.h with 100% similarity]
drivers/gpu/drm/savage/savage_state.c [moved from drivers/char/drm/savage_state.c with 100% similarity]
drivers/gpu/drm/sis/Makefile [new file with mode: 0644]
drivers/gpu/drm/sis/sis_drv.c [moved from drivers/char/drm/sis_drv.c with 100% similarity]
drivers/gpu/drm/sis/sis_drv.h [moved from drivers/char/drm/sis_drv.h with 100% similarity]
drivers/gpu/drm/sis/sis_mm.c [moved from drivers/char/drm/sis_mm.c with 100% similarity]
drivers/gpu/drm/tdfx/Makefile [new file with mode: 0644]
drivers/gpu/drm/tdfx/tdfx_drv.c [moved from drivers/char/drm/tdfx_drv.c with 100% similarity]
drivers/gpu/drm/tdfx/tdfx_drv.h [moved from drivers/char/drm/tdfx_drv.h with 100% similarity]
drivers/gpu/drm/via/Makefile [new file with mode: 0644]
drivers/gpu/drm/via/via_3d_reg.h [moved from drivers/char/drm/via_3d_reg.h with 100% similarity]
drivers/gpu/drm/via/via_dma.c [moved from drivers/char/drm/via_dma.c with 100% similarity]
drivers/gpu/drm/via/via_dmablit.c [moved from drivers/char/drm/via_dmablit.c with 100% similarity]
drivers/gpu/drm/via/via_dmablit.h [moved from drivers/char/drm/via_dmablit.h with 100% similarity]
drivers/gpu/drm/via/via_drv.c [moved from drivers/char/drm/via_drv.c with 100% similarity]
drivers/gpu/drm/via/via_drv.h [moved from drivers/char/drm/via_drv.h with 100% similarity]
drivers/gpu/drm/via/via_irq.c [moved from drivers/char/drm/via_irq.c with 100% similarity]
drivers/gpu/drm/via/via_map.c [moved from drivers/char/drm/via_map.c with 100% similarity]
drivers/gpu/drm/via/via_mm.c [moved from drivers/char/drm/via_mm.c with 100% similarity]
drivers/gpu/drm/via/via_verifier.c [moved from drivers/char/drm/via_verifier.c with 100% similarity]
drivers/gpu/drm/via/via_verifier.h [moved from drivers/char/drm/via_verifier.h with 100% similarity]
drivers/gpu/drm/via/via_video.c [moved from drivers/char/drm/via_video.c with 100% similarity]
drivers/video/Kconfig
include/Kbuild
include/drm/Kbuild [new file with mode: 0644]
include/drm/drm.h [moved from drivers/char/drm/drm.h with 100% similarity]
include/drm/drmP.h [moved from drivers/char/drm/drmP.h with 100% similarity]
include/drm/drm_core.h [moved from drivers/char/drm/drm_core.h with 100% similarity]
include/drm/drm_hashtab.h [moved from drivers/char/drm/drm_hashtab.h with 100% similarity]
include/drm/drm_memory.h [moved from drivers/char/drm/drm_memory.h with 100% similarity]
include/drm/drm_memory_debug.h [moved from drivers/char/drm/drm_memory_debug.h with 100% similarity]
include/drm/drm_os_linux.h [moved from drivers/char/drm/drm_os_linux.h with 100% similarity]
include/drm/drm_pciids.h [moved from drivers/char/drm/drm_pciids.h with 100% similarity]
include/drm/drm_sarea.h [moved from drivers/char/drm/drm_sarea.h with 100% similarity]
include/drm/drm_sman.h [moved from drivers/char/drm/drm_sman.h with 100% similarity]
include/drm/i810_drm.h [moved from drivers/char/drm/i810_drm.h with 100% similarity]
include/drm/i830_drm.h [moved from drivers/char/drm/i830_drm.h with 100% similarity]
include/drm/i915_drm.h [moved from drivers/char/drm/i915_drm.h with 100% similarity]
include/drm/mga_drm.h [moved from drivers/char/drm/mga_drm.h with 100% similarity]
include/drm/r128_drm.h [moved from drivers/char/drm/r128_drm.h with 100% similarity]
include/drm/radeon_drm.h [moved from drivers/char/drm/radeon_drm.h with 100% similarity]
include/drm/savage_drm.h [moved from drivers/char/drm/savage_drm.h with 100% similarity]
include/drm/sis_drm.h [moved from drivers/char/drm/sis_drm.h with 100% similarity]
include/drm/via_drm.h [moved from drivers/char/drm/via_drm.h with 100% similarity]

index f65deda72d6102636e47554c9864d529df27a258..fda44679dffc72ebb05f3241e8780eb86cf56b97 100644 (file)
@@ -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
index 4c1c584e9eb678d366e575a3cd983b287d4419e0..81630a68475cd7ad8859c650c20a6431fae60539 100644 (file)
@@ -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
deleted file mode 100644 (file)
index 1283ded..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Makefile for the drm device driver.  This driver provides support for the
-# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
-
-drm-objs    := 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
-
-tdfx-objs   := tdfx_drv.o
-r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
-mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
-i810-objs   := i810_drv.o i810_dma.o
-i830-objs   := i830_drv.o i830_dma.o i830_irq.o
-i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o
-radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
-sis-objs    := sis_drv.o sis_mm.o
-savage-objs := savage_drv.o savage_bci.o savage_state.o
-via-objs    := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
-
-ifeq ($(CONFIG_COMPAT),y)
-drm-objs    += drm_ioc32.o
-radeon-objs += radeon_ioc32.o
-mga-objs    += mga_ioc32.o
-r128-objs   += r128_ioc32.o
-i915-objs   += i915_ioc32.o
-endif
-
-obj-$(CONFIG_DRM)      += drm.o
-obj-$(CONFIG_DRM_TDFX) += tdfx.o
-obj-$(CONFIG_DRM_R128) += r128.o
-obj-$(CONFIG_DRM_RADEON)+= radeon.o
-obj-$(CONFIG_DRM_MGA)  += mga.o
-obj-$(CONFIG_DRM_I810) += i810.o
-obj-$(CONFIG_DRM_I830) += i830.o
-obj-$(CONFIG_DRM_I915)  += i915.o
-obj-$(CONFIG_DRM_SIS)   += sis.o
-obj-$(CONFIG_DRM_SAVAGE)+= savage.o
-obj-$(CONFIG_DRM_VIA)  +=via.o
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
new file mode 100644 (file)
index 0000000..de566cf
--- /dev/null
@@ -0,0 +1 @@
+obj-y                  += drm/
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
new file mode 100644 (file)
index 0000000..e9f9a97
--- /dev/null
@@ -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/gpu/drm/i810/Makefile b/drivers/gpu/drm/i810/Makefile
new file mode 100644 (file)
index 0000000..43844ec
--- /dev/null
@@ -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/gpu/drm/i830/Makefile b/drivers/gpu/drm/i830/Makefile
new file mode 100644 (file)
index 0000000..c642ee0
--- /dev/null
@@ -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/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
new file mode 100644 (file)
index 0000000..a9e6046
--- /dev/null
@@ -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/gpu/drm/mga/Makefile b/drivers/gpu/drm/mga/Makefile
new file mode 100644 (file)
index 0000000..6068478
--- /dev/null
@@ -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/gpu/drm/r128/Makefile b/drivers/gpu/drm/r128/Makefile
new file mode 100644 (file)
index 0000000..1cc72ae
--- /dev/null
@@ -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/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile
new file mode 100644 (file)
index 0000000..feb521e
--- /dev/null
@@ -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/gpu/drm/savage/Makefile b/drivers/gpu/drm/savage/Makefile
new file mode 100644 (file)
index 0000000..d8f84ac
--- /dev/null
@@ -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/gpu/drm/sis/Makefile b/drivers/gpu/drm/sis/Makefile
new file mode 100644 (file)
index 0000000..441c061
--- /dev/null
@@ -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/gpu/drm/tdfx/Makefile b/drivers/gpu/drm/tdfx/Makefile
new file mode 100644 (file)
index 0000000..0379f29
--- /dev/null
@@ -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/gpu/drm/via/Makefile b/drivers/gpu/drm/via/Makefile
new file mode 100644 (file)
index 0000000..d59e258
--- /dev/null
@@ -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
index e0c5f96b273d150bbca242222b6aee9869d716ba..9b887ef64ff1c27c857602833211dd2b6b2d7716 100644 (file)
@@ -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
index b52288774345deaf39d422aaa380c85590b36772..bdca155028ecd343b4ebf0182904dc83f1e61469 100644 (file)
@@ -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
new file mode 100644 (file)
index 0000000..82b6983
--- /dev/null
@@ -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
similarity index 100%
rename from drivers/char/drm/drm.h
rename to include/drm/drm.h
similarity index 100%
rename from drivers/char/drm/drmP.h
rename to include/drm/drmP.h