rpms/kernel/F-13 drm-nouveau-updates.patch, 1.9, 1.10 kernel.spec, 1.2054, 1.2055
Ben Skeggs
bskeggs at fedoraproject.org
Mon Jun 7 04:41:09 UTC 2010
Author: bskeggs
Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10858
Modified Files:
drm-nouveau-updates.patch kernel.spec
Log Message:
* Mon Jun 07 2010 Ben Skeggs <bskeggs at redhat.com>
- nouveau: fix iommu errors on GeForce 8 and newer chipsets (rh#561267)
drm-nouveau-updates.patch:
Makefile | 7
nouveau_bios.c | 672 +++++++++-----
nouveau_bios.h | 132 +-
nouveau_bo.c | 68 -
nouveau_calc.c | 4
nouveau_channel.c | 15
nouveau_connector.c | 163 ++-
nouveau_connector.h | 3
nouveau_debugfs.c | 18
nouveau_dma.c | 5
nouveau_dp.c | 8
nouveau_drv.c | 14
nouveau_drv.h | 59 -
nouveau_encoder.h | 3
nouveau_gem.c | 55 -
nouveau_hw.c | 6
nouveau_i2c.c | 23
nouveau_irq.c | 615 ++++++++++++-
nouveau_mem.c | 124 +-
nouveau_reg.h | 1
nouveau_sgdma.c | 18
nouveau_state.c | 20
nv04_crtc.c | 6
nv04_dac.c | 8
nv04_dfp.c | 4
nv04_display.c | 49 -
nv04_fbcon.c | 6
nv04_fifo.c | 5
nv04_tv.c | 2
nv17_tv.c | 6
nv40_fifo.c | 7
nv40_graph.c | 21
nv50_calc.c | 88 +
nv50_crtc.c | 46 -
nv50_dac.c | 4
nv50_display.c | 111 +-
nv50_display.h | 1
nv50_fb.c | 38
nv50_fbcon.c | 17
nv50_fifo.c | 5
nv50_gpio.c | 76 +
nv50_graph.c | 103 +-
nv50_grctx.c | 2383 ++++++++++++++++++++++++++++++++++++++++++++++++++++
nv50_instmem.c | 18
nv50_sor.c | 31
45 files changed, 4304 insertions(+), 764 deletions(-)
Index: drm-nouveau-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/drm-nouveau-updates.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- drm-nouveau-updates.patch 27 May 2010 00:25:54 -0000 1.9
+++ drm-nouveau-updates.patch 7 Jun 2010 04:41:08 -0000 1.10
@@ -1,4 +1,4 @@
-From 9e776eefa1dc0513515c34a715b3362b868c0324 Mon Sep 17 00:00:00 2001
+From a4cbb7f1379aa9817c85840c6d079dd222641dbd Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Wed, 17 Feb 2010 19:04:00 +0100
Subject: [PATCH] drm-nouveau-updates
@@ -440,6 +440,10 @@ since the default state in the GPIO tabl
Fixes rh#582621
Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
+
+drm/nv50: fix iommu errors caused by device reading from address 0
+
+Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
---
drivers/gpu/drm/nouveau/Makefile | 7 +-
drivers/gpu/drm/nouveau/nouveau_bios.c | 672 +++++---
@@ -478,7 +482,7 @@ Signed-off-by: Ben Skeggs <bskeggs at redha
drivers/gpu/drm/nouveau/nv50_dac.c | 4 +-
drivers/gpu/drm/nouveau/nv50_display.c | 111 +-
drivers/gpu/drm/nouveau/nv50_display.h | 1 +
- drivers/gpu/drm/nouveau/nv50_fb.c | 32 +
+ drivers/gpu/drm/nouveau/nv50_fb.c | 38 +
drivers/gpu/drm/nouveau/nv50_fbcon.c | 17 +-
drivers/gpu/drm/nouveau/nv50_fifo.c | 5 +
drivers/gpu/drm/nouveau/nv50_gpio.c | 76 +
@@ -486,7 +490,7 @@ Signed-off-by: Ben Skeggs <bskeggs at redha
drivers/gpu/drm/nouveau/nv50_grctx.c | 2383 +++++++++++++++++++++++++++
drivers/gpu/drm/nouveau/nv50_instmem.c | 18 +-
drivers/gpu/drm/nouveau/nv50_sor.c | 30 +-
- 45 files changed, 4298 insertions(+), 763 deletions(-)
+ 45 files changed, 4304 insertions(+), 763 deletions(-)
create mode 100644 drivers/gpu/drm/nouveau/nv50_calc.c
create mode 100644 drivers/gpu/drm/nouveau/nv50_fb.c
create mode 100644 drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -4790,10 +4794,10 @@ index 3ae8d07..581d405 100644
int nv50_display_destroy(struct drm_device *dev);
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c
new file mode 100644
-index 0000000..a95e694
+index 0000000..32611bd
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nv50_fb.c
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,38 @@
+#include "drmP.h"
+#include "drm.h"
+#include "nouveau_drv.h"
@@ -4802,10 +4806,16 @@ index 0000000..a95e694
+int
+nv50_fb_init(struct drm_device *dev)
+{
-+ /* This is needed to get meaningful information from 100c90
-+ * on traps. No idea what these values mean exactly. */
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+
++ /* Not a clue what this is exactly. Without pointing it at a
++ * scratch page, VRAM->GART blits with M2MF (as in DDX DFS)
++ * cause IOMMU "read from address 0" errors (rh#561267)
++ */
++ nv_wr32(dev, 0x100c08, dev_priv->gart_info.sg_dummy_bus >> 8);
++
++ /* This is needed to get meaningful information from 100c90
++ * on traps. No idea what these values mean exactly. */
+ switch (dev_priv->chipset) {
+ case 0x50:
+ nv_wr32(dev, 0x100c90, 0x0707ff);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2054
retrieving revision 1.2055
diff -u -p -r1.2054 -r1.2055
--- kernel.spec 3 Jun 2010 23:13:13 -0000 1.2054
+++ kernel.spec 7 Jun 2010 04:41:08 -0000 1.2055
@@ -2187,6 +2187,9 @@ fi
# and build.
%changelog
+* Mon Jun 07 2010 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: fix iommu errors on GeForce 8 and newer chipsets (rh#561267)
+
* Thu Jun 03 2010 Kyle McMartin <kyle at redhat.com>
- But keep it for kernel-headers...
More information about the scm-commits
mailing list