rpms/kernel/devel drm-nouveau.patch, 1.46, 1.47 kernel.spec, 1.1773, 1.1774
Ben Skeggs
bskeggs at fedoraproject.org
Tue Sep 8 07:11:34 UTC 2009
- Previous message (by thread): rpms/setup/devel .cvsignore, 1.66, 1.67 setup.spec, 1.84, 1.85 sources, 1.67, 1.68
- Next message (by thread): rpms/kernel/devel drm-nouveau.patch, 1.47, 1.48 kernel.spec, 1.1774, 1.1775
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6743
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
- drm-nouveau.patch: more misc fixes
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 45
drivers/gpu/drm/Makefile | 2
drivers/gpu/drm/drm_bufs.c | 28
drivers/gpu/drm/i2c/Makefile | 4
drivers/gpu/drm/i2c/ch7006_drv.c | 532
drivers/gpu/drm/i2c/ch7006_mode.c | 473
drivers/gpu/drm/i2c/ch7006_priv.h | 340
drivers/gpu/drm/nouveau/Makefile | 27
drivers/gpu/drm/nouveau/nouveau_backlight.c | 155
drivers/gpu/drm/nouveau/nouveau_bios.c | 5209 ++++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 235
drivers/gpu/drm/nouveau/nouveau_bo.c | 622
drivers/gpu/drm/nouveau/nouveau_calc.c | 626
drivers/gpu/drm/nouveau/nouveau_channel.c | 520
drivers/gpu/drm/nouveau/nouveau_connector.c | 689
drivers/gpu/drm/nouveau/nouveau_connector.h | 55
drivers/gpu/drm/nouveau/nouveau_crtc.h | 95
drivers/gpu/drm/nouveau/nouveau_display.c | 115
drivers/gpu/drm/nouveau/nouveau_dma.c | 206
drivers/gpu/drm/nouveau/nouveau_dma.h | 148
drivers/gpu/drm/nouveau/nouveau_drv.c | 432
drivers/gpu/drm/nouveau/nouveau_drv.h | 1201 +
drivers/gpu/drm/nouveau/nouveau_encoder.h | 66
drivers/gpu/drm/nouveau/nouveau_fb.h | 47
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 350
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48
drivers/gpu/drm/nouveau/nouveau_fence.c | 261
drivers/gpu/drm/nouveau/nouveau_gem.c | 942 +
drivers/gpu/drm/nouveau/nouveau_hw.c | 1077 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 446
drivers/gpu/drm/nouveau/nouveau_i2c.c | 256
drivers/gpu/drm/nouveau/nouveau_i2c.h | 45
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 675
drivers/gpu/drm/nouveau/nouveau_mem.c | 565
drivers/gpu/drm/nouveau/nouveau_notifier.c | 194
drivers/gpu/drm/nouveau/nouveau_object.c | 1279 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 834 +
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 317
drivers/gpu/drm/nouveau/nouveau_state.c | 826 +
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nouveau_ttm.c | 131
drivers/gpu/drm/nouveau/nv04_crtc.c | 1014 +
drivers/gpu/drm/nouveau/nv04_cursor.c | 70
drivers/gpu/drm/nouveau/nv04_dac.c | 525
drivers/gpu/drm/nouveau/nv04_dfp.c | 621
drivers/gpu/drm/nouveau/nv04_display.c | 293
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fbcon.c | 292
drivers/gpu/drm/nouveau/nv04_fifo.c | 295
drivers/gpu/drm/nouveau/nv04_graph.c | 583
drivers/gpu/drm/nouveau/nv04_instmem.c | 207
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_timer.c | 51
drivers/gpu/drm/nouveau/nv04_tv.c | 304
drivers/gpu/drm/nouveau/nv10_fb.c | 24
drivers/gpu/drm/nouveau/nv10_fifo.c | 177
drivers/gpu/drm/nouveau/nv10_graph.c | 945 +
drivers/gpu/drm/nouveau/nv17_tv.c | 660
drivers/gpu/drm/nouveau/nv17_tv.h | 156
drivers/gpu/drm/nouveau/nv17_tv_modes.c | 582
drivers/gpu/drm/nouveau/nv20_graph.c | 784
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 223
drivers/gpu/drm/nouveau/nv40_graph.c | 2203 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_crtc.c | 799 +
drivers/gpu/drm/nouveau/nv50_cursor.c | 151
drivers/gpu/drm/nouveau/nv50_dac.c | 296
drivers/gpu/drm/nouveau/nv50_display.c | 905 +
drivers/gpu/drm/nouveau/nv50_display.h | 46
drivers/gpu/drm/nouveau/nv50_evo.h | 113
drivers/gpu/drm/nouveau/nv50_fbcon.c | 256
drivers/gpu/drm/nouveau/nv50_fifo.c | 475
drivers/gpu/drm/nouveau/nv50_graph.c | 439
drivers/gpu/drm/nouveau/nv50_grctx.h |22284 ++++++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 499
drivers/gpu/drm/nouveau/nv50_mc.c | 40
drivers/gpu/drm/nouveau/nv50_sor.c | 250
drivers/gpu/drm/nouveau/nvreg.h | 535
drivers/gpu/drm/ttm/ttm_bo.c | 4
include/drm/Kbuild | 1
include/drm/drmP.h | 2
include/drm/i2c/ch7006.h | 86
include/drm/nouveau_drm.h | 216
85 files changed, 57749 insertions(+), 21 deletions(-)
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- drm-nouveau.patch 8 Sep 2009 04:18:48 -0000 1.46
+++ drm-nouveau.patch 8 Sep 2009 07:11:25 -0000 1.47
@@ -9686,7 +9686,7 @@ index 0000000..75dbe9b
+#endif /* __NOUVEAU_CONNECTOR_H__ */
diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h
new file mode 100644
-index 0000000..af61663
+index 0000000..49fa7b2
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
@@ -0,0 +1,95 @@
@@ -9736,7 +9736,7 @@ index 0000000..af61663
+ int cpp;
+ bool blanked;
+ uint32_t offset;
-+ bool tiled;
++ uint32_t tile_flags;
+ } fb;
+
+ struct {
@@ -12454,7 +12454,7 @@ index 0000000..0f40414
+
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
new file mode 100644
-index 0000000..32b4bb9
+index 0000000..230a99b
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -0,0 +1,261 @@
@@ -12664,7 +12664,7 @@ index 0000000..32b4bb9
+ schedule_timeout(1);
+
+ if (intr && signal_pending(current)) {
-+ ret = -ERESTART;
++ ret = -ERESTARTSYS;
+ break;
+ }
+ }
@@ -12721,10 +12721,10 @@ index 0000000..32b4bb9
+
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
new file mode 100644
-index 0000000..f0c78a8
+index 0000000..226eca2
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -0,0 +1,943 @@
+@@ -0,0 +1,942 @@
+/*
+ * Copyright (C) 2008 Ben Skeggs.
+ * All Rights Reserved.
@@ -13037,15 +13037,16 @@ index 0000000..f0c78a8
+ chan->fence.sequence);
+ if (ret) {
+ nouveau_gem_pushbuf_backoff(list);
-+ if (ret == -EAGAIN) {
++ if (ret == -EAGAIN)
+ ret = ttm_bo_wait_unreserved(&nvbo->bo, false);
-+ if (unlikely(ret))
-+ goto out_unref;
-+ goto retry;
-+ } else
++ drm_gem_object_unreference(gem);
++ if (ret)
+ goto out_unref;
++ goto retry;
+ }
+
++ list_add_tail(&nvbo->entry, list);
++
+ if (unlikely(atomic_read(&nvbo->bo.cpu_writers) > 0)) {
+ nouveau_gem_pushbuf_backoff(list);
+ ret = ttm_bo_wait_cpu(&nvbo->bo, false);
@@ -13053,8 +13054,6 @@ index 0000000..f0c78a8
+ goto out_unref;
+ goto retry;
+ }
-+
-+ list_add_tail(&nvbo->entry, list);
+ }
+
+ b = pbbo;
@@ -30798,10 +30797,10 @@ index 0000000..2a3495e
+}
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
new file mode 100644
-index 0000000..8fb1ef8
+index 0000000..641a85a
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,796 @@
+@@ -0,0 +1,799 @@
+/*
+ * Copyright (C) 2008 Maarten Maathuis.
+ * All Rights Reserved.
@@ -30952,11 +30951,14 @@ index 0000000..8fb1ef8
+ OUT_RING (evo, crtc->fb.offset >> 8);
+ OUT_RING (evo, 0);
+ BEGIN_RING(evo, 0, NV50_EVO_CRTC(index, FB_DMA), 1);
-+ if (dev_priv->chipset != 0x50 && crtc->fb.tiled)
-+ if (crtc->fb.cpp == 2)
++ if (dev_priv->chipset != 0x50)
++ if (crtc->fb.tile_flags == 0x7a00)
++ OUT_RING(evo, NvEvoFB32);
++ else
++ if (crtc->fb.tile_flags == 0x7000)
+ OUT_RING(evo, NvEvoFB16);
+ else
-+ OUT_RING(evo, NvEvoFB32);
++ OUT_RING(evo, NvEvoVRAM);
+ else
+ OUT_RING(evo, NvEvoVRAM);
+ }
@@ -31365,7 +31367,7 @@ index 0000000..8fb1ef8
+ }
+
+ crtc->fb.offset = fb->nvbo->bo.offset - dev_priv->vm_vram_base;
-+ crtc->fb.tiled = fb->nvbo->tile_flags ? true : false;
++ crtc->fb.tile_flags = fb->nvbo->tile_flags;
+ crtc->fb.cpp = drm_fb->bits_per_pixel / 8;
+ if (!crtc->fb.blanked && dev_priv->chipset != 0x50) {
+ ret = RING_SPACE(evo, 2);
@@ -31373,12 +31375,12 @@ index 0000000..8fb1ef8
+ return ret;
+
+ BEGIN_RING(evo, 0, NV50_EVO_CRTC(crtc->index, FB_DMA), 1);
-+ if (crtc->fb.tiled) {
-+ if (crtc->fb.cpp == 4)
-+ OUT_RING (evo, NvEvoFB32);
-+ else
-+ OUT_RING (evo, NvEvoFB16);
-+ } else
++ if (crtc->fb.tile_flags == 0x7a00)
++ OUT_RING (evo, NvEvoFB32);
++ else
++ if (crtc->fb.tile_flags == 0x7000)
++ OUT_RING (evo, NvEvoFB16);
++ else
+ OUT_RING (evo, NvEvoVRAM);
+ }
+
@@ -31390,7 +31392,7 @@ index 0000000..8fb1ef8
+ OUT_RING (evo, crtc->fb.offset >> 8);
+ OUT_RING (evo, 0);
+ OUT_RING (evo, (drm_fb->height << 16) | drm_fb->width);
-+ if (!crtc->fb.tiled) {
++ if (!crtc->fb.tile_flags) {
+ OUT_RING (evo, drm_fb->pitch | (1 << 20));
+ } else {
+ OUT_RING (evo, ((drm_fb->pitch / 4) << 4) |
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1773
retrieving revision 1.1774
diff -u -p -r1.1773 -r1.1774
--- kernel.spec 8 Sep 2009 06:09:56 -0000 1.1773
+++ kernel.spec 8 Sep 2009 07:11:29 -0000 1.1774
@@ -2020,6 +2020,9 @@ fi
# and build.
%changelog
+* Tue Sep 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.211.rc9.git1
+- drm-nouveau.patch: more misc fixes
+
* Tue Sep 08 2009 Dave Airlie <airlied at redhat.com> 2.6.31-0.210.rc9.git1
- drm-page-flip.patch: rebase again
- Previous message (by thread): rpms/setup/devel .cvsignore, 1.66, 1.67 setup.spec, 1.84, 1.85 sources, 1.67, 1.68
- Next message (by thread): rpms/kernel/devel drm-nouveau.patch, 1.47, 1.48 kernel.spec, 1.1774, 1.1775
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list