rpms/kernel/F-11 drm-nouveau.patch, 1.58, 1.59 kernel.spec, 1.1675, 1.1676
Ben Skeggs
bskeggs at fedoraproject.org
Wed Jul 22 05:06:10 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18515
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Wed Jul 22 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: Fix DPMS off for DAC outputs, NV4x PFIFO typo
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 15
drivers/gpu/drm/Makefile | 1
drivers/gpu/drm/drm_bufs.c | 28
drivers/gpu/drm/drm_fence.c | 2
drivers/gpu/drm/drm_gem.c | 50
drivers/gpu/drm/nouveau/Makefile | 24
drivers/gpu/drm/nouveau/nouveau_backlight.c | 152
drivers/gpu/drm/nouveau/nouveau_bios.c | 4852 +++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 223
drivers/gpu/drm/nouveau/nouveau_bo.c | 415
drivers/gpu/drm/nouveau/nouveau_calc.c | 622
drivers/gpu/drm/nouveau/nouveau_connector.h | 51
drivers/gpu/drm/nouveau/nouveau_crtc.h | 74
drivers/gpu/drm/nouveau/nouveau_display.c | 114
drivers/gpu/drm/nouveau/nouveau_dma.c | 209
drivers/gpu/drm/nouveau/nouveau_dma.h | 107
drivers/gpu/drm/nouveau/nouveau_drv.c | 194
drivers/gpu/drm/nouveau/nouveau_drv.h | 836
drivers/gpu/drm/nouveau/nouveau_encoder.h | 46
drivers/gpu/drm/nouveau/nouveau_fb.h | 44
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 946 +
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 48
drivers/gpu/drm/nouveau/nouveau_fence.c | 126
drivers/gpu/drm/nouveau/nouveau_fifo.c | 692
drivers/gpu/drm/nouveau/nouveau_gem.c | 729
drivers/gpu/drm/nouveau/nouveau_hw.c | 1019 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 530
drivers/gpu/drm/nouveau/nouveau_i2c.c | 222
drivers/gpu/drm/nouveau/nouveau_i2c.h | 46
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 592
drivers/gpu/drm/nouveau/nouveau_mem.c | 1073 +
drivers/gpu/drm/nouveau/nouveau_notifier.c | 176
drivers/gpu/drm/nouveau/nouveau_object.c | 1236 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 854
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 340
drivers/gpu/drm/nouveau/nouveau_state.c | 1043 +
drivers/gpu/drm/nouveau/nouveau_swmthd.c | 190
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fifo.c | 144
drivers/gpu/drm/nouveau/nv04_graph.c | 521
drivers/gpu/drm/nouveau/nv04_instmem.c | 190
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_timer.c | 50
drivers/gpu/drm/nouveau/nv10_fb.c | 24
drivers/gpu/drm/nouveau/nv10_fifo.c | 175
drivers/gpu/drm/nouveau/nv10_graph.c | 912 +
drivers/gpu/drm/nouveau/nv20_graph.c | 907 +
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 216
drivers/gpu/drm/nouveau/nv40_graph.c | 2179 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_connector.c | 491
drivers/gpu/drm/nouveau/nv50_crtc.c | 810
drivers/gpu/drm/nouveau/nv50_cursor.c | 144
drivers/gpu/drm/nouveau/nv50_dac.c | 288
drivers/gpu/drm/nouveau/nv50_display.c | 637
drivers/gpu/drm/nouveau/nv50_display.h | 44
drivers/gpu/drm/nouveau/nv50_display_commands.h | 195
drivers/gpu/drm/nouveau/nv50_fbcon.c | 222
drivers/gpu/drm/nouveau/nv50_fifo.c | 343
drivers/gpu/drm/nouveau/nv50_graph.c | 336
drivers/gpu/drm/nouveau/nv50_grctx.h |20935 ++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 382
drivers/gpu/drm/nouveau/nv50_mc.c | 40
drivers/gpu/drm/nouveau/nv50_sor.c | 303
drivers/gpu/drm/nouveau/nvreg.h | 495
include/drm/Kbuild | 1
include/drm/drmP.h | 2
include/drm/nouveau_drm.h | 299
71 files changed, 49410 insertions(+), 42 deletions(-)
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- drm-nouveau.patch 29 Jun 2009 23:43:07 -0000 1.58
+++ drm-nouveau.patch 22 Jul 2009 05:06:09 -0000 1.59
@@ -21413,7 +21413,7 @@ index 0000000..530bbee
+}
diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c
new file mode 100644
-index 0000000..2f44daa
+index 0000000..742ef4c
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv40_fifo.c
@@ -0,0 +1,216 @@
@@ -21560,7 +21560,7 @@ index 0000000..2f44daa
+
+ /* Set channel active, and in DMA mode */
+ nv_wr32(NV03_PFIFO_CACHE1_PUSH1,
-+ NV03_PFIFO_CACHE1_PUSH1_DMA | chan->id);
++ NV40_PFIFO_CACHE1_PUSH1_DMA | chan->id);
+
+ /* Reset DMA_CTL_AT_INFO to INVALID */
+ tmp = nv_rd32(NV04_PFIFO_CACHE1_DMA_CTL) & ~(1<<31);
@@ -25327,10 +25327,10 @@ index 0000000..763cffe
+
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
new file mode 100644
-index 0000000..e0569d0
+index 0000000..6140391
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c
-@@ -0,0 +1,287 @@
+@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2008 Maarten Maathuis.
+ * All Rights Reserved.
@@ -25431,7 +25431,8 @@ index 0000000..e0569d0
+ load_state = nv_rd32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or));
+
+ nv_wr32(NV50_PDISPLAY_DAC_REGS_LOAD_CTRL(or), 0);
-+ nv_wr32(NV50_PDISPLAY_DAC_REGS_DPMS_CTRL(or), dpms_state);
++ nv_wr32(NV50_PDISPLAY_DAC_REGS_DPMS_CTRL(or), dpms_state |
++ NV50_PDISPLAY_DAC_REGS_DPMS_CTRL_PENDING);
+
+ if ((load_state & NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_PRESENT) ==
+ NV50_PDISPLAY_DAC_REGS_LOAD_CTRL_PRESENT)
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1675
retrieving revision 1.1676
diff -u -p -r1.1675 -r1.1676
--- kernel.spec 8 Jul 2009 00:28:17 -0000 1.1675
+++ kernel.spec 22 Jul 2009 05:06:09 -0000 1.1676
@@ -2096,6 +2096,9 @@ fi
# and build.
%changelog
+* Wed Jul 22 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: Fix DPMS off for DAC outputs, NV4x PFIFO typo
+
* Tue Jul 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.6-213
- Drop the correct patch to fix bug #498858
More information about the fedora-extras-commits
mailing list