drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index d1bed40..55c9fdc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -478,7 +478,7 @@
struct drm_nouveau_private *dev_priv = chan->dev->dev_private;
struct drm_device *dev = chan->dev;
struct nouveau_gpuobj *obj;
- u32 page_addr, flags0, flags2;
+ u32 flags0, flags2;
int ret;
if (dev_priv->card_type >= NV_50) {
@@ -495,12 +495,8 @@
base += dev_priv->gart_info.aper_base;
} else
if (base != 0) {
- ret = nouveau_sgdma_get_page(dev, base, &page_addr);
- if (ret)
- return ret;
-
+ base = nouveau_sgdma_get_physical(dev, base);
target = NV_MEM_TARGET_PCI;
- base = page_addr;
} else {
nouveau_gpuobj_ref(dev_priv->gart_info.sg_ctxdma, pobj);
return 0;