]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
nouveau/ttm/PCIe: Use dma_addr if TTM has set it.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Dec 2010 16:36:24 +0000 (11:36 -0500)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 18 Feb 2011 22:27:49 +0000 (17:27 -0500)
commite0138c26cdeee8c033256ccd9e07d66db3c998be
tree2d354ce89abb54bf9ae36e6ca287e12d84c2ed5b
parentc39d35161e87f1d7c0628af6907ac66a8c77f63f
nouveau/ttm/PCIe: Use dma_addr if TTM has set it.

If the TTM layer has used the DMA API to setup pages that are
TTM_PAGE_FLAG_DMA32 (look at patch titled: "ttm: Utilize the
DMA API for pages that have TTM_PAGE_FLAG_DMA32 set"), lets
use it when programming the GART in the PCIe type cards.

This patch skips doing the pci_map_page (and pci_unmap_page) if
there is a DMA addresses passed in for that page. If the dma_address
is zero (or DMA_ERROR_CODE), then we continue on with our old
behaviour.

[v2: Added a review-by tag]

Reviewed-by: Thomas Hellstrom <thomas@shipmail.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Ian Campbell <ian.campbell@citrix.com>
drivers/gpu/drm/nouveau/nouveau_sgdma.c