rpms/kernel/devel drm-nouveau.patch, 1.39, 1.40 kernel.spec, 1.1673, 1.1674
Ben Skeggs
bskeggs at fedoraproject.org
Thu Jul 30 08:41:41 UTC 2009
- Previous message (by thread): rpms/xscreensaver/devel xscreensaver-autostart, NONE, 1.1 xscreensaver-autostart.desktop, NONE, 1.1 xscreensaver.spec, 1.92, 1.93
- Next message (by thread): rpms/kdepim/devel .cvsignore, 1.66, 1.67 kdepim.spec, 1.227, 1.228 sources, 1.74, 1.75
- 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-serv26247
Modified Files:
drm-nouveau.patch kernel.spec
Log Message:
* Thu Jul 30 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: another DCB 1.5 entry, G80 corruption fixes, small <G80 KMS fix
drm-nouveau.patch:
drivers/gpu/drm/Kconfig | 30
drivers/gpu/drm/Makefile | 1
drivers/gpu/drm/drm_bufs.c | 28
drivers/gpu/drm/nouveau/Makefile | 27
drivers/gpu/drm/nouveau/nouveau_backlight.c | 156
drivers/gpu/drm/nouveau/nouveau_bios.c | 5052 ++++++
drivers/gpu/drm/nouveau/nouveau_bios.h | 226
drivers/gpu/drm/nouveau/nouveau_bo.c | 567
drivers/gpu/drm/nouveau/nouveau_calc.c | 622
drivers/gpu/drm/nouveau/nouveau_connector.h | 55
drivers/gpu/drm/nouveau/nouveau_crtc.h | 90
drivers/gpu/drm/nouveau/nouveau_display.c | 115
drivers/gpu/drm/nouveau/nouveau_dma.c | 143
drivers/gpu/drm/nouveau/nouveau_dma.h | 144
drivers/gpu/drm/nouveau/nouveau_drv.c | 353
drivers/gpu/drm/nouveau/nouveau_drv.h | 1145 +
drivers/gpu/drm/nouveau/nouveau_encoder.h | 51
drivers/gpu/drm/nouveau/nouveau_fb.h | 43
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1019 +
drivers/gpu/drm/nouveau/nouveau_fbcon.h | 49
drivers/gpu/drm/nouveau/nouveau_fence.c | 261
drivers/gpu/drm/nouveau/nouveau_fifo.c | 668
drivers/gpu/drm/nouveau/nouveau_gem.c | 751
drivers/gpu/drm/nouveau/nouveau_hw.c | 1019 +
drivers/gpu/drm/nouveau/nouveau_hw.h | 431
drivers/gpu/drm/nouveau/nouveau_i2c.c | 274
drivers/gpu/drm/nouveau/nouveau_i2c.h | 46
drivers/gpu/drm/nouveau/nouveau_ioc32.c | 72
drivers/gpu/drm/nouveau/nouveau_irq.c | 674
drivers/gpu/drm/nouveau/nouveau_mem.c | 557
drivers/gpu/drm/nouveau/nouveau_notifier.c | 192
drivers/gpu/drm/nouveau/nouveau_object.c | 1258 +
drivers/gpu/drm/nouveau/nouveau_reg.h | 834 +
drivers/gpu/drm/nouveau/nouveau_sgdma.c | 331
drivers/gpu/drm/nouveau/nouveau_state.c | 837 +
drivers/gpu/drm/nouveau/nouveau_swmthd.h | 33
drivers/gpu/drm/nouveau/nouveau_ttm.c | 116
drivers/gpu/drm/nouveau/nv04_crtc.c | 1135 +
drivers/gpu/drm/nouveau/nv04_cursor.c | 70
drivers/gpu/drm/nouveau/nv04_display.c | 250
drivers/gpu/drm/nouveau/nv04_fb.c | 21
drivers/gpu/drm/nouveau/nv04_fbcon.c | 291
drivers/gpu/drm/nouveau/nv04_fifo.c | 146
drivers/gpu/drm/nouveau/nv04_graph.c | 586
drivers/gpu/drm/nouveau/nv04_instmem.c | 182
drivers/gpu/drm/nouveau/nv04_mc.c | 20
drivers/gpu/drm/nouveau/nv04_output.c | 1193 +
drivers/gpu/drm/nouveau/nv04_timer.c | 51
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/nv20_graph.c | 958 +
drivers/gpu/drm/nouveau/nv40_fb.c | 62
drivers/gpu/drm/nouveau/nv40_fifo.c | 222
drivers/gpu/drm/nouveau/nv40_graph.c | 2200 ++
drivers/gpu/drm/nouveau/nv40_mc.c | 38
drivers/gpu/drm/nouveau/nv50_connector.c | 495
drivers/gpu/drm/nouveau/nv50_crtc.c | 812 +
drivers/gpu/drm/nouveau/nv50_cursor.c | 153
drivers/gpu/drm/nouveau/nv50_dac.c | 284
drivers/gpu/drm/nouveau/nv50_display.c | 844 +
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 | 432
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 | 268
drivers/gpu/drm/nouveau/nvreg.h | 503
drivers/gpu/drm/ttm/ttm_bo.c | 4
include/drm/Kbuild | 1
include/drm/drmP.h | 2
include/drm/nouveau_drm.h | 214
75 files changed, 54545 insertions(+), 21 deletions(-)
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- drm-nouveau.patch 29 Jul 2009 05:57:21 -0000 1.39
+++ drm-nouveau.patch 30 Jul 2009 08:41:40 -0000 1.40
@@ -300,10 +300,10 @@ index 0000000..d0f3bc9
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
new file mode 100644
-index 0000000..27676f4
+index 0000000..70f6947
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
-@@ -0,0 +1,5050 @@
+@@ -0,0 +1,5052 @@
+/*
+ * Copyright 2005-2006 Erik Waling
+ * Copyright 2006 Stephane Marchesin
@@ -4858,10 +4858,12 @@ index 0000000..27676f4
+parse_dcb15_entry(struct drm_device *dev, struct parsed_dcb *dcb,
+ uint32_t conn, uint32_t conf, struct dcb_entry *entry)
+{
-+ if (conn != 0xf0003f00 && conn != 0xf2247f10 &&
-+ conn != 0xf2204001 && conn != 0xf2204301 && conn != 0xf2204311 && conn != 0xf2208001 && conn != 0xf2244001 && conn != 0xf2244301 && conn != 0xf2244311 && conn != 0xf4204011 && conn != 0xf4208011 && conn != 0xf4248011 &&
-+ conn != 0xf2045ff2 &&
-+ conn != 0xf2045f14 && conn != 0xf207df14 && conn != 0xf2205004) {
++ if (conn != 0xf0003f00 && conn != 0xf2247f10 && conn != 0xf2204001 &&
++ conn != 0xf2204301 && conn != 0xf2204311 && conn != 0xf2208001 &&
++ conn != 0xf2244001 && conn != 0xf2244301 && conn != 0xf2244311 &&
++ conn != 0xf4204011 && conn != 0xf4208011 && conn != 0xf4248011 &&
++ conn != 0xf2045ff2 && conn != 0xf2045f14 && conn != 0xf207df14 &&
++ conn != 0xf2205004 && conn != 0xf2209004) {
+ NV_ERROR(dev, "Unknown DCB 1.5 entry, please report\n");
+
+ /* cause output setting to fail for !TV, so message is seen */
@@ -14312,10 +14314,10 @@ index 0000000..bad3712
+}
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
new file mode 100644
-index 0000000..cd8d9ba
+index 0000000..3a3d384
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
-@@ -0,0 +1,543 @@
+@@ -0,0 +1,557 @@
+/*
+ * Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
+ * Copyright 2005 Stephane Marchesin
@@ -14570,6 +14572,20 @@ index 0000000..cd8d9ba
+ }
+ dev_priv->engine.instmem.finish_access(dev);
+
++ nv_wr32(dev, 0x100c80, 0x00050001);
++ if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
++ NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
++ NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
++ return -EBUSY;
++ }
++
++ nv_wr32(dev, 0x100c80, 0x00000001);
++ if (!nv_wait(0x100c80, 0x00000001, 0x00000000)) {
++ NV_ERROR(dev, "timeout: (0x100c80 & 1) == 0 (2)\n");
++ NV_ERROR(dev, "0x100c80 = 0x%08x\n", nv_rd32(dev, 0x100c80));
++ return -EBUSY;
++ }
++
+ return 0;
+}
+
@@ -18504,10 +18520,10 @@ index 0000000..2fb3804
+
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c
new file mode 100644
-index 0000000..4b743a7
+index 0000000..c732fbe
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
-@@ -0,0 +1,1126 @@
+@@ -0,0 +1,1135 @@
+/*
+ * Copyright 1993-2003 NVIDIA, Corporation
+ * Copyright 2006 Dave Airlie
@@ -19477,6 +19493,15 @@ index 0000000..4b743a7
+ nv_crtc_gamma_load(nv_crtc);
+ }
+
++ regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] &= ~3;
++ regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (crtc->fb->depth + 1) / 8;
++ regp->ramdac_gen_ctrl &= ~NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
++ if (crtc->fb->depth == 16)
++ regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
++ crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_PIXEL_INDEX);
++ NVWriteRAMDAC(crtc->dev, nv_crtc->index, NV_PRAMDAC_GENERAL_CONTROL,
++ regp->ramdac_gen_ctrl);
++
+ regp->CRTC[NV_CIO_CR_OFFSET_INDEX] = drm_fb->pitch >> 3;
+ regp->CRTC[NV_CIO_CRE_RPC0_INDEX] =
+ XLATE(drm_fb->pitch >> 3, 8, NV_CIO_CRE_RPC0_OFFSET_10_8);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1673
retrieving revision 1.1674
diff -u -p -r1.1673 -r1.1674
--- kernel.spec 29 Jul 2009 21:10:48 -0000 1.1673
+++ kernel.spec 30 Jul 2009 08:41:41 -0000 1.1674
@@ -1933,6 +1933,9 @@ fi
# and build.
%changelog
+* Thu Jul 30 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: another DCB 1.5 entry, G80 corruption fixes, small <G80 KMS fix
+
* Thu Jul 30 2009 Dave Airlie <airlied at redhat.com>
- fix VGA ARB + kms
- Previous message (by thread): rpms/xscreensaver/devel xscreensaver-autostart, NONE, 1.1 xscreensaver-autostart.desktop, NONE, 1.1 xscreensaver.spec, 1.92, 1.93
- Next message (by thread): rpms/kdepim/devel .cvsignore, 1.66, 1.67 kdepim.spec, 1.227, 1.228 sources, 1.74, 1.75
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list