diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-07 05:59:40 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-08 03:03:45 +0200 |
| commit | 4eb3033c72099fab3536ed8ac54a5dc99f0832d7 (patch) | |
| tree | c2a93bb99d4948c1b95149d463ebfdfdbf5dce17 /drivers | |
| parent | drm/nouveau: off by one in init_i2c_device_find() (diff) | |
| download | linux-4eb3033c72099fab3536ed8ac54a5dc99f0832d7.tar.xz linux-4eb3033c72099fab3536ed8ac54a5dc99f0832d7.zip | |
drm/nv50: fix iommu errors caused by device reading from address 0
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_fb.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c index a95e6941ba88..32611bd30e6d 100644 --- a/drivers/gpu/drm/nouveau/nv50_fb.c +++ b/drivers/gpu/drm/nouveau/nv50_fb.c @@ -6,10 +6,16 @@ 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); |