Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd70b6cd authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation. 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 60d2a88a

drivers/gpu/drm/nouveau/nouveau_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -934,8 +934,8 @@ extern void nouveau_irq_uninstall(struct drm_device *); 
/* nouveau_sgdma.c */

extern int nouveau_sgdma_init(struct drm_device *);

extern void nouveau_sgdma_takedown(struct drm_device *);

extern int nouveau_sgdma_get_page(struct drm_device *, uint32_t offset,

				  uint32_t *page);

extern uint32_t nouveau_sgdma_get_physical(struct drm_device *,

					   uint32_t offset);

extern struct ttm_backend *nouveau_sgdma_init_ttm(struct drm_device *);



/* nouveau_debugfs.c */

drivers/gpu/drm/nouveau/nouveau_object.c

+2 −6
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class, u64 base, 
	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 @@ nouveau_gpuobj_dma_new(struct nouveau_channel *chan, int class, u64 base, 
			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;

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+6 −10
Original line number Diff line number Diff line
@@ -267,19 +267,15 @@ nouveau_sgdma_takedown(struct drm_device *dev) 
	nouveau_vm_put(&dev_priv->gart_info.vma);

}



int

nouveau_sgdma_get_page(struct drm_device *dev, uint32_t offset, uint32_t *page)

uint32_t

nouveau_sgdma_get_physical(struct drm_device *dev, uint32_t offset)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_gpuobj *gpuobj = dev_priv->gart_info.sg_ctxdma;

	int pte;

	int pte = (offset >> NV_CTXDMA_PAGE_SHIFT) + 2;



	pte = (offset >> NV_CTXDMA_PAGE_SHIFT) << 2;

	if (dev_priv->card_type < NV_50) {

		*page = nv_ro32(gpuobj, (pte + 8)) & ~NV_CTXDMA_PAGE_MASK;

		return 0;

	}

	BUG_ON(dev_priv->card_type >= NV_50);



	NV_ERROR(dev, "Unimplemented on NV50\n");

	return -EINVAL;

	return (nv_ro32(gpuobj, 4 * pte) & ~NV_CTXDMA_PAGE_MASK) |

		(offset & NV_CTXDMA_PAGE_MASK);

}