rpms/kernel/F-8 kernel.spec, 1.364, 1.365 linux-2.6-drm-radeon-update.patch, 1.3, 1.4 nouveau-drm.patch, 1.6, 1.7 linux-2.6-agp-mm.patch, 1.1, NONE linux-2.6-drm-mm.patch, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Thu Mar 6 05:19:08 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785
Modified Files:
kernel.spec linux-2.6-drm-radeon-update.patch
nouveau-drm.patch
Removed Files:
linux-2.6-agp-mm.patch linux-2.6-drm-mm.patch
Log Message:
* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.6.24.3-19
- fixup agp/drm patches for F8 kernel
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- kernel.spec 5 Mar 2008 01:41:44 -0000 1.364
+++ kernel.spec 6 Mar 2008 05:18:18 -0000 1.365
@@ -691,9 +691,6 @@
Patch1520: linux-2.6-dcdbas-autoload.patch
-# drm-mm catchup (modesetting, ...)
-Patch1801: linux-2.6-drm-mm.patch
-Patch1800: linux-2.6-agp-mm.patch
# nouveau + drm fixes
Patch1802: nouveau-drm.patch
Patch1803: linux-2.6-ppc32-ucmpdi2.patch
@@ -1042,9 +1039,6 @@
# kill annoying messages
ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
-# drm-mm catchup (modesetting, ...)
-ApplyPatch linux-2.6-agp-mm.patch
-ApplyPatch linux-2.6-drm-mm.patch
# Nouveau DRM + drm fixes
ApplyPatch nouveau-drm.patch
ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
@@ -1921,6 +1915,9 @@
%changelog
+* Thu Mar 06 2008 Dave Airlie <airlied at redhat.com> 2.6.24.3-19
+- fixup agp/drm patches for F8 kernel
+
* Tue Mar 04 2008 John W. Linville <linville at redhat.com> 2.6.24.3-18
- libertas: fix sanity check on sequence number in command response
- p54: fix EEPROM structure endianness
linux-2.6-drm-radeon-update.patch:
Index: linux-2.6-drm-radeon-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-drm-radeon-update.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-drm-radeon-update.patch 15 Feb 2008 23:58:52 -0000 1.3
+++ linux-2.6-drm-radeon-update.patch 6 Mar 2008 05:18:18 -0000 1.4
@@ -97,10 +97,10 @@
- dev_priv->fb_location = (RADEON_READ(RADEON_MC_FB_LOCATION)
- & 0xffff) << 16;
-+ dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16;
- dev_priv->fb_size =
++ dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16;
+ dev_priv->fb_size =
- ((RADEON_READ(RADEON_MC_FB_LOCATION) & 0xffff0000u) + 0x10000)
-+ ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000)
++ ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000)
- dev_priv->fb_location;
dev_priv->front_pitch_offset = (((dev_priv->front_pitch / 64) << 22) |
nouveau-drm.patch:
Index: nouveau-drm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/nouveau-drm.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nouveau-drm.patch 15 Feb 2008 23:58:54 -0000 1.6
+++ nouveau-drm.patch 6 Mar 2008 05:18:18 -0000 1.7
@@ -4,10 +4,157 @@
Subject: [PATCH] drm: add nouveau latest code
---
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_bufs.c linux-2.6.23.noarch/drivers/char/drm/drm_bufs.c
---- linux-2.6.23.noarch.old/drivers/char/drm/drm_bufs.c 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/drm_bufs.c 2007-11-26 21:16:13.000000000 -0500
-@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struc
+ drivers/char/drm/Kconfig | 5 +
+ drivers/char/drm/Makefile | 12 +
+ drivers/char/drm/drmP.h | 4 +-
+ drivers/char/drm/drm_bufs.c | 6 +-
+ drivers/char/drm/drm_irq.c | 3 +-
+ drivers/char/drm/drm_pciids.h | 262 ++++
+ drivers/char/drm/nouveau_dma.c | 177 +++
+ drivers/char/drm/nouveau_dma.h | 98 ++
+ drivers/char/drm/nouveau_drm.h | 166 ++
+ drivers/char/drm/nouveau_drv.c | 96 ++
+ drivers/char/drm/nouveau_drv.h | 584 +++++++
+ drivers/char/drm/nouveau_fifo.c | 557 +++++++
+ drivers/char/drm/nouveau_ioc32.c | 72 +
+ drivers/char/drm/nouveau_irq.c | 430 ++++++
+ drivers/char/drm/nouveau_mem.c | 616 ++++++++
+ drivers/char/drm/nouveau_notifier.c | 173 +++
+ drivers/char/drm/nouveau_object.c | 1148 ++++++++++++++
+ drivers/char/drm/nouveau_reg.h | 538 +++++++
+ drivers/char/drm/nouveau_sgdma.c | 311 ++++
+ drivers/char/drm/nouveau_state.c | 569 +++++++
+ drivers/char/drm/nv04_fb.c | 24 +
+ drivers/char/drm/nv04_fifo.c | 129 ++
+ drivers/char/drm/nv04_graph.c | 415 +++++
+ drivers/char/drm/nv04_instmem.c | 160 ++
+ drivers/char/drm/nv04_mc.c | 23 +
+ drivers/char/drm/nv04_timer.c | 45 +
+ drivers/char/drm/nv10_fb.c | 26 +
+ drivers/char/drm/nv10_fifo.c | 160 ++
+ drivers/char/drm/nv10_graph.c | 777 ++++++++++
+ drivers/char/drm/nv20_graph.c | 249 +++
+ drivers/char/drm/nv30_graph.c | 2911 +++++++++++++++++++++++++++++++++++
+ drivers/char/drm/nv40_fb.c | 56 +
+ drivers/char/drm/nv40_fifo.c | 208 +++
+ drivers/char/drm/nv40_graph.c | 1906 +++++++++++++++++++++++
+ drivers/char/drm/nv40_mc.c | 39 +
+ drivers/char/drm/nv50_fifo.c | 327 ++++
+ drivers/char/drm/nv50_graph.c | 316 ++++
+ drivers/char/drm/nv50_instmem.c | 320 ++++
+ drivers/char/drm/nv50_mc.c | 43 +
+ 39 files changed, 13957 insertions(+), 4 deletions(-)
+ create mode 100644 drivers/char/drm/nouveau_dma.c
+ create mode 100644 drivers/char/drm/nouveau_dma.h
+ create mode 100644 drivers/char/drm/nouveau_drm.h
+ create mode 100644 drivers/char/drm/nouveau_drv.c
+ create mode 100644 drivers/char/drm/nouveau_drv.h
+ create mode 100644 drivers/char/drm/nouveau_fifo.c
+ create mode 100644 drivers/char/drm/nouveau_ioc32.c
+ create mode 100644 drivers/char/drm/nouveau_irq.c
+ create mode 100644 drivers/char/drm/nouveau_mem.c
+ create mode 100644 drivers/char/drm/nouveau_notifier.c
+ create mode 100644 drivers/char/drm/nouveau_object.c
+ create mode 100644 drivers/char/drm/nouveau_reg.h
+ create mode 100644 drivers/char/drm/nouveau_sgdma.c
+ create mode 100644 drivers/char/drm/nouveau_state.c
+ create mode 100644 drivers/char/drm/nv04_fb.c
+ create mode 100644 drivers/char/drm/nv04_fifo.c
+ create mode 100644 drivers/char/drm/nv04_graph.c
+ create mode 100644 drivers/char/drm/nv04_instmem.c
+ create mode 100644 drivers/char/drm/nv04_mc.c
+ create mode 100644 drivers/char/drm/nv04_timer.c
+ create mode 100644 drivers/char/drm/nv10_fb.c
+ create mode 100644 drivers/char/drm/nv10_fifo.c
+ create mode 100644 drivers/char/drm/nv10_graph.c
+ create mode 100644 drivers/char/drm/nv20_graph.c
+ create mode 100644 drivers/char/drm/nv30_graph.c
+ create mode 100644 drivers/char/drm/nv40_fb.c
+ create mode 100644 drivers/char/drm/nv40_fifo.c
+ create mode 100644 drivers/char/drm/nv40_graph.c
+ create mode 100644 drivers/char/drm/nv40_mc.c
+ create mode 100644 drivers/char/drm/nv50_fifo.c
+ create mode 100644 drivers/char/drm/nv50_graph.c
+ create mode 100644 drivers/char/drm/nv50_instmem.c
+ create mode 100644 drivers/char/drm/nv50_mc.c
+
+diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
+index 0b7ffa5..0220619 100644
+--- a/drivers/char/drm/Kconfig
++++ b/drivers/char/drm/Kconfig
+@@ -106,3 +106,8 @@ config DRM_SAVAGE
+ Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
+ chipset. If M is selected the module will be called savage.
+
++config DRM_NOUVEAU
++ tristate "Nvidia video cards"
++ depends on DRM
++ help
++ Choose this for nvidia open source 3d driver
+diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile
+index 6915a05..f798916 100644
+--- a/drivers/char/drm/Makefile
++++ b/drivers/char/drm/Makefile
+@@ -14,6 +14,16 @@ 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
++nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
++ nouveau_object.o nouveau_irq.o nouveau_notifier.o \
++ nouveau_sgdma.o nouveau_dma.o \
++ nv04_timer.o \
++ nv04_mc.o nv40_mc.o nv50_mc.o \
++ nv04_fb.o nv10_fb.o nv40_fb.o \
++ nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
++ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \
++ nv40_graph.o nv50_graph.o \
++ nv04_instmem.o nv50_instmem.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
+@@ -25,6 +35,7 @@ radeon-objs += radeon_ioc32.o
+ mga-objs += mga_ioc32.o
+ r128-objs += r128_ioc32.o
+ i915-objs += i915_ioc32.o
++nouveau-objs += nouveau_ioc32.o
+ endif
+
+ obj-$(CONFIG_DRM) += drm.o
+@@ -35,6 +46,7 @@ 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_NOUVEAU) += nouveau.o
+ obj-$(CONFIG_DRM_SIS) += sis.o
+ obj-$(CONFIG_DRM_SAVAGE)+= savage.o
+ obj-$(CONFIG_DRM_VIA) +=via.o
+diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
+index 9dd0760..d539c96 100644
+--- a/drivers/char/drm/drmP.h
++++ b/drivers/char/drm/drmP.h
+@@ -967,7 +967,8 @@ extern unsigned long drm_get_resource_start(struct drm_device *dev,
+ unsigned int resource);
+ extern unsigned long drm_get_resource_len(struct drm_device *dev,
+ unsigned int resource);
+-
++struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
++ drm_local_map_t *map);
+ /* DMA support (drm_dma.h) */
+ extern int drm_dma_setup(struct drm_device *dev);
+ extern void drm_dma_takedown(struct drm_device *dev);
+@@ -979,6 +980,7 @@ extern void drm_core_reclaim_buffers(struct drm_device *dev,
+ extern int drm_control(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+ extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
++extern int drm_irq_install(struct drm_device * dev);
+ extern int drm_irq_uninstall(struct drm_device *dev);
+ extern void drm_driver_irq_preinstall(struct drm_device *dev);
+ extern void drm_driver_irq_postinstall(struct drm_device *dev);
+diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
+index 856774f..7890e08 100644
+--- a/drivers/char/drm/drm_bufs.c
++++ b/drivers/char/drm/drm_bufs.c
+@@ -49,8 +49,8 @@ unsigned long drm_get_resource_len(struct drm_device *dev, unsigned int resource
EXPORT_SYMBOL(drm_get_resource_len);
@@ -18,7 +165,7 @@
{
struct drm_map_list *entry;
list_for_each_entry(entry, &dev->maplist, head) {
-@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_mat
+@@ -63,6 +63,7 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
return NULL;
}
@@ -26,10 +173,19 @@
static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
unsigned long user_token, int hashed_handle)
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_irq.c linux-2.6.23.noarch/drivers/char/drm/drm_irq.c
---- linux-2.6.23.noarch.old/drivers/char/drm/drm_irq.c 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/drm_irq.c 2007-11-26 21:16:13.000000000 -0500
-@@ -81,7 +81,7 @@ int drm_irq_by_busid(struct drm_device *
+@@ -429,6 +430,7 @@ int drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
+
+ return ret;
+ }
++EXPORT_SYMBOL(drm_rmmap);
+
+ /* The rmmap ioctl appears to be unnecessary. All mappings are torn down on
+ * the last close of the device, and this is necessary for cleanup when things
+diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
+index 05eae63..c091729 100644
+--- a/drivers/char/drm/drm_irq.c
++++ b/drivers/char/drm/drm_irq.c
+@@ -81,7 +81,7 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
* \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions
* before and after the installation.
*/
@@ -38,7 +194,7 @@
{
int ret;
unsigned long sh_flags = 0;
-@@ -141,6 +141,7 @@ static int drm_irq_install(struct drm_de
+@@ -141,6 +141,7 @@ static int drm_irq_install(struct drm_device * dev)
return 0;
}
@@ -46,14 +202,14 @@
/**
* Uninstall the IRQ handler.
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drm_pciids.h linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h
---- linux-2.6.23.noarch.old/drivers/char/drm/drm_pciids.h 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/drm_pciids.h 2007-11-26 21:24:20.000000000 -0500
-@@ -311,3 +311,265 @@
- {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
+index 30b200b..a59f999 100644
+--- a/drivers/char/drm/drm_pciids.h
++++ b/drivers/char/drm/drm_pciids.h
+@@ -314,3 +314,265 @@
{0x8086, 0x2a12, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0, 0, 0}
-+
+
+#define nouveau_PCI_IDS \
+ {0x10de, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_03}, \
+ {0x10de, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_03}, \
@@ -315,80 +471,12 @@
+ {0x12d2, 0x002c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_04}, \
+ {0x12d2, 0x00a0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NV_04}, \
+ {0, 0, 0}
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/drmP.h linux-2.6.23.noarch/drivers/char/drm/drmP.h
---- linux-2.6.23.noarch.old/drivers/char/drm/drmP.h 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/drmP.h 2007-11-26 21:16:13.000000000 -0500
-@@ -1030,7 +1030,8 @@ extern unsigned long drm_get_resource_st
- unsigned int resource);
- extern unsigned long drm_get_resource_len(struct drm_device *dev,
- unsigned int resource);
--
-+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-+ drm_local_map_t *map);
- /* DMA support (drm_dma.h) */
- extern int drm_dma_setup(struct drm_device *dev);
- extern void drm_dma_takedown(struct drm_device *dev);
-@@ -1042,6 +1043,7 @@ extern void drm_core_reclaim_buffers(str
- extern int drm_control(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
- extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
-+extern int drm_irq_install(struct drm_device * dev);
- extern int drm_irq_uninstall(struct drm_device *dev);
- extern void drm_driver_irq_preinstall(struct drm_device *dev);
- extern void drm_driver_irq_postinstall(struct drm_device *dev);
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/Kconfig linux-2.6.23.noarch/drivers/char/drm/Kconfig
---- linux-2.6.23.noarch.old/drivers/char/drm/Kconfig 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/Kconfig 2007-11-26 21:20:41.000000000 -0500
-@@ -105,3 +105,10 @@ config DRM_SAVAGE
- help
- Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
- chipset. If M is selected the module will be called savage.
+
-+config DRM_NOUVEAU
-+ tristate "Nvidia video cards"
-+ depends on DRM
-+ help
-+ Choose this for nvidia open source 3d driver
-+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/Makefile linux-2.6.23.noarch/drivers/char/drm/Makefile
---- linux-2.6.23.noarch.old/drivers/char/drm/Makefile 2007-11-26 21:18:35.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/Makefile 2007-11-26 21:21:50.000000000 -0500
-@@ -15,6 +15,16 @@ mga-objs := mga_drv.o mga_dma.o mga_s
- 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 i915_fence.o i915_buffer.o
-+nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
-+ nouveau_object.o nouveau_irq.o nouveau_notifier.o \
-+ nouveau_sgdma.o nouveau_dma.o \
-+ nv04_timer.o \
-+ nv04_mc.o nv40_mc.o nv50_mc.o \
-+ nv04_fb.o nv10_fb.o nv40_fb.o \
-+ nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
-+ nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \
-+ nv40_graph.o nv50_graph.o \
-+ nv04_instmem.o nv50_instmem.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
-@@ -26,6 +36,7 @@ radeon-objs += radeon_ioc32.o
- mga-objs += mga_ioc32.o
- r128-objs += r128_ioc32.o
- i915-objs += i915_ioc32.o
-+nouveau-objs += nouveau_ioc32.o
- endif
-
- obj-$(CONFIG_DRM) += drm.o
-@@ -36,6 +47,7 @@ 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_NOUVEAU) += nouveau.o
- obj-$(CONFIG_DRM_SIS) += sis.o
- obj-$(CONFIG_DRM_SAVAGE)+= savage.o
- obj-$(CONFIG_DRM_VIA) +=via.o
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.c linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_dma.c b/drivers/char/drm/nouveau_dma.c
+new file mode 100644
+index 0000000..ab502e6
+--- /dev/null
++++ b/drivers/char/drm/nouveau_dma.c
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -567,9 +655,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.h linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.h
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_dma.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_dma.h 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_dma.h b/drivers/char/drm/nouveau_dma.h
+new file mode 100644
+index 0000000..5e51c1c
+--- /dev/null
++++ b/drivers/char/drm/nouveau_dma.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -669,9 +759,11 @@
+
+#endif
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drm.h linux-2.6.23.noarch/drivers/char/drm/nouveau_drm.h
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drm.h 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_drm.h b/drivers/char/drm/nouveau_drm.h
+new file mode 100644
+index 0000000..bfc9bd4
+--- /dev/null
++++ b/drivers/char/drm/nouveau_drm.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
@@ -839,9 +931,11 @@
+
+#endif /* __NOUVEAU_DRM_H__ */
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.c linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_drv.c b/drivers/char/drm/nouveau_drv.c
+new file mode 100644
+index 0000000..387e3d6
+--- /dev/null
++++ b/drivers/char/drm/nouveau_drv.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
@@ -939,9 +1033,11 @@
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL and additional rights");
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.h linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.h
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_drv.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_drv.h 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_drv.h b/drivers/char/drm/nouveau_drv.h
+new file mode 100644
+index 0000000..2a16d3b
+--- /dev/null
++++ b/drivers/char/drm/nouveau_drv.h
@@ -0,0 +1,584 @@
+/*
+ * Copyright 2005 Stephane Marchesin.
@@ -1527,9 +1623,11 @@
+
+#endif /* __NOUVEAU_DRV_H__ */
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_fifo.c linux-2.6.23.noarch/drivers/char/drm/nouveau_fifo.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_fifo.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_fifo.c b/drivers/char/drm/nouveau_fifo.c
+new file mode 100644
+index 0000000..1aa724f
+--- /dev/null
++++ b/drivers/char/drm/nouveau_fifo.c
@@ -0,0 +1,557 @@
+/*
+ * Copyright 2005-2006 Stephane Marchesin
@@ -2088,9 +2186,11 @@
+};
+
+int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_ioc32.c linux-2.6.23.noarch/drivers/char/drm/nouveau_ioc32.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_ioc32.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_ioc32.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_ioc32.c b/drivers/char/drm/nouveau_ioc32.c
+new file mode 100644
+index 0000000..f55ae7a
+--- /dev/null
++++ b/drivers/char/drm/nouveau_ioc32.c
@@ -0,0 +1,72 @@
+/**
+ * \file mga_ioc32.c
@@ -2164,9 +2264,11 @@
+
+ return ret;
+}
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_irq.c linux-2.6.23.noarch/drivers/char/drm/nouveau_irq.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_irq.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_irq.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_irq.c b/drivers/char/drm/nouveau_irq.c
+new file mode 100644
+index 0000000..e64677e
+--- /dev/null
++++ b/drivers/char/drm/nouveau_irq.c
@@ -0,0 +1,430 @@
+/*
+ * Copyright (C) 2006 Ben Skeggs.
@@ -2598,9 +2700,11 @@
+ return IRQ_HANDLED;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_mem.c linux-2.6.23.noarch/drivers/char/drm/nouveau_mem.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_mem.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_mem.c b/drivers/char/drm/nouveau_mem.c
+new file mode 100644
+index 0000000..1394df5
+--- /dev/null
++++ b/drivers/char/drm/nouveau_mem.c
@@ -0,0 +1,616 @@
+/*
+ * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
@@ -3218,9 +3322,11 @@
+}
+
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_notifier.c linux-2.6.23.noarch/drivers/char/drm/nouveau_notifier.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_notifier.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_notifier.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_notifier.c b/drivers/char/drm/nouveau_notifier.c
+new file mode 100644
+index 0000000..71b8cbe
+--- /dev/null
++++ b/drivers/char/drm/nouveau_notifier.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -3395,9 +3501,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_object.c linux-2.6.23.noarch/drivers/char/drm/nouveau_object.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_object.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_object.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_object.c b/drivers/char/drm/nouveau_object.c
+new file mode 100644
+index 0000000..fbce770
+--- /dev/null
++++ b/drivers/char/drm/nouveau_object.c
@@ -0,0 +1,1148 @@
+/*
+ * Copyright (C) 2006 Ben Skeggs.
@@ -4547,9 +4655,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_reg.h linux-2.6.23.noarch/drivers/char/drm/nouveau_reg.h
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_reg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_reg.h 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_reg.h b/drivers/char/drm/nouveau_reg.h
+new file mode 100644
+index 0000000..a1895c3
+--- /dev/null
++++ b/drivers/char/drm/nouveau_reg.h
@@ -0,0 +1,538 @@
+
+
@@ -5089,9 +5199,11 @@
+#define NV40_RAMFC_UNK_4C 0x4C
+#define NV40_RAMFC_UNK_50 0x50
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_sgdma.c linux-2.6.23.noarch/drivers/char/drm/nouveau_sgdma.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_sgdma.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_sgdma.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_sgdma.c b/drivers/char/drm/nouveau_sgdma.c
+new file mode 100644
+index 0000000..3b3d8f9
+--- /dev/null
++++ b/drivers/char/drm/nouveau_sgdma.c
@@ -0,0 +1,311 @@
+#include "drmP.h"
+#include "nouveau_drv.h"
@@ -5404,9 +5516,11 @@
+ return -EINVAL;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nouveau_state.c linux-2.6.23.noarch/drivers/char/drm/nouveau_state.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nouveau_state.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nouveau_state.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nouveau_state.c b/drivers/char/drm/nouveau_state.c
+new file mode 100644
+index 0000000..7ab7f7d
+--- /dev/null
++++ b/drivers/char/drm/nouveau_state.c
@@ -0,0 +1,569 @@
+/*
+ * Copyright 2005 Stephane Marchesin
@@ -5977,9 +6091,11 @@
+}
+
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_fb.c linux-2.6.23.noarch/drivers/char/drm/nv04_fb.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_fb.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_fb.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_fb.c b/drivers/char/drm/nv04_fb.c
+new file mode 100644
+index 0000000..534fb50
+--- /dev/null
++++ b/drivers/char/drm/nv04_fb.c
@@ -0,0 +1,24 @@
+#include "drmP.h"
+#include "drm.h"
@@ -6005,9 +6121,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv04_fifo.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_fifo.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_fifo.c b/drivers/char/drm/nv04_fifo.c
+new file mode 100644
+index 0000000..d750ced
+--- /dev/null
++++ b/drivers/char/drm/nv04_fifo.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -6138,9 +6256,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_graph.c linux-2.6.23.noarch/drivers/char/drm/nv04_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_graph.c b/drivers/char/drm/nv04_graph.c
+new file mode 100644
+index 0000000..050f6e8
+--- /dev/null
++++ b/drivers/char/drm/nv04_graph.c
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2007 Stephane Marchesin
@@ -6557,9 +6677,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_instmem.c linux-2.6.23.noarch/drivers/char/drm/nv04_instmem.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_instmem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_instmem.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_instmem.c b/drivers/char/drm/nv04_instmem.c
+new file mode 100644
+index 0000000..fed6ff7
+--- /dev/null
++++ b/drivers/char/drm/nv04_instmem.c
@@ -0,0 +1,160 @@
+#include "drmP.h"
+#include "drm.h"
@@ -6721,9 +6843,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_mc.c linux-2.6.23.noarch/drivers/char/drm/nv04_mc.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_mc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_mc.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_mc.c b/drivers/char/drm/nv04_mc.c
+new file mode 100644
+index 0000000..eee0c50
+--- /dev/null
++++ b/drivers/char/drm/nv04_mc.c
@@ -0,0 +1,23 @@
+#include "drmP.h"
+#include "drm.h"
@@ -6748,9 +6872,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv04_timer.c linux-2.6.23.noarch/drivers/char/drm/nv04_timer.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv04_timer.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv04_timer.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv04_timer.c b/drivers/char/drm/nv04_timer.c
+new file mode 100644
+index 0000000..08a27f4
+--- /dev/null
++++ b/drivers/char/drm/nv04_timer.c
@@ -0,0 +1,45 @@
+#include "drmP.h"
+#include "drm.h"
@@ -6797,9 +6923,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_fb.c linux-2.6.23.noarch/drivers/char/drm/nv10_fb.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_fb.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv10_fb.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv10_fb.c b/drivers/char/drm/nv10_fb.c
+new file mode 100644
+index 0000000..7fff5b3
+--- /dev/null
++++ b/drivers/char/drm/nv10_fb.c
@@ -0,0 +1,26 @@
+#include "drmP.h"
+#include "drm.h"
@@ -6827,9 +6955,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv10_fifo.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv10_fifo.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv10_fifo.c b/drivers/char/drm/nv10_fifo.c
+new file mode 100644
+index 0000000..c86725d
+--- /dev/null
++++ b/drivers/char/drm/nv10_fifo.c
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -6991,9 +7121,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv10_graph.c linux-2.6.23.noarch/drivers/char/drm/nv10_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv10_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv10_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv10_graph.c b/drivers/char/drm/nv10_graph.c
+new file mode 100644
+index 0000000..e470ff0
+--- /dev/null
++++ b/drivers/char/drm/nv10_graph.c
@@ -0,0 +1,777 @@
+/*
+ * Copyright 2007 Matthieu CASTET <castet.matthieu at free.fr>
@@ -7772,9 +7904,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv20_graph.c linux-2.6.23.noarch/drivers/char/drm/nv20_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv20_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv20_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv20_graph.c b/drivers/char/drm/nv20_graph.c
+new file mode 100644
+index 0000000..c163daf
+--- /dev/null
++++ b/drivers/char/drm/nv20_graph.c
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2007 Matthieu CASTET <castet.matthieu at free.fr>
@@ -8025,9 +8159,11 @@
+ nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table);
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv30_graph.c linux-2.6.23.noarch/drivers/char/drm/nv30_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv30_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv30_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv30_graph.c b/drivers/char/drm/nv30_graph.c
+new file mode 100644
+index 0000000..ca43bb9
+--- /dev/null
++++ b/drivers/char/drm/nv30_graph.c
@@ -0,0 +1,2911 @@
+/*
+ * Based on nv40_graph.c
@@ -10940,9 +11076,11 @@
+ nouveau_gpuobj_ref_del(dev, &dev_priv->ctx_table);
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_fb.c linux-2.6.23.noarch/drivers/char/drm/nv40_fb.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_fb.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv40_fb.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv40_fb.c b/drivers/char/drm/nv40_fb.c
+new file mode 100644
+index 0000000..2cbb40e
+--- /dev/null
++++ b/drivers/char/drm/nv40_fb.c
@@ -0,0 +1,56 @@
+#include "drmP.h"
+#include "drm.h"
@@ -11000,9 +11138,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv40_fifo.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv40_fifo.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv40_fifo.c b/drivers/char/drm/nv40_fifo.c
+new file mode 100644
+index 0000000..ce3f8fd
+--- /dev/null
++++ b/drivers/char/drm/nv40_fifo.c
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -11212,9 +11352,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_graph.c linux-2.6.23.noarch/drivers/char/drm/nv40_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv40_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv40_graph.c b/drivers/char/drm/nv40_graph.c
+new file mode 100644
+index 0000000..26237c7
+--- /dev/null
++++ b/drivers/char/drm/nv40_graph.c
@@ -0,0 +1,1906 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -13122,9 +13264,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv40_mc.c linux-2.6.23.noarch/drivers/char/drm/nv40_mc.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv40_mc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv40_mc.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv40_mc.c b/drivers/char/drm/nv40_mc.c
+new file mode 100644
+index 0000000..c7db902
+--- /dev/null
++++ b/drivers/char/drm/nv40_mc.c
@@ -0,0 +1,39 @@
+#include "drmP.h"
+#include "drm.h"
@@ -13165,9 +13309,11 @@
+{
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_fifo.c linux-2.6.23.noarch/drivers/char/drm/nv50_fifo.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv50_fifo.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv50_fifo.c b/drivers/char/drm/nv50_fifo.c
+new file mode 100644
+index 0000000..7859544
+--- /dev/null
++++ b/drivers/char/drm/nv50_fifo.c
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -13496,9 +13642,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_graph.c linux-2.6.23.noarch/drivers/char/drm/nv50_graph.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_graph.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv50_graph.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv50_graph.c b/drivers/char/drm/nv50_graph.c
+new file mode 100644
+index 0000000..e5bbf65
+--- /dev/null
++++ b/drivers/char/drm/nv50_graph.c
@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -13816,9 +13964,11 @@
+ return nv50_graph_transfer_context(dev, inst, 1);
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_instmem.c linux-2.6.23.noarch/drivers/char/drm/nv50_instmem.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_instmem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv50_instmem.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv50_instmem.c b/drivers/char/drm/nv50_instmem.c
+new file mode 100644
+index 0000000..1eeb54d
+--- /dev/null
++++ b/drivers/char/drm/nv50_instmem.c
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -14140,9 +14290,11 @@
+ return 0;
+}
+
-diff -uNrp linux-2.6.23.noarch.old/drivers/char/drm/nv50_mc.c linux-2.6.23.noarch/drivers/char/drm/nv50_mc.c
---- linux-2.6.23.noarch.old/drivers/char/drm/nv50_mc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/char/drm/nv50_mc.c 2007-11-26 21:16:13.000000000 -0500
+diff --git a/drivers/char/drm/nv50_mc.c b/drivers/char/drm/nv50_mc.c
+new file mode 100644
+index 0000000..b111826
+--- /dev/null
++++ b/drivers/char/drm/nv50_mc.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2007 Ben Skeggs.
@@ -14187,3 +14339,6 @@
+void nv50_mc_takedown(struct drm_device *dev)
+{
+}
+--
+1.5.2.5
+
--- linux-2.6-agp-mm.patch DELETED ---
--- linux-2.6-drm-mm.patch DELETED ---
More information about the fedora-extras-commits
mailing list