Commit dcccdc14 authored Dec 11, 2014 by Alexandre Courbot Committed by Ben Skeggs Dec 22, 2014

drm/nouveau: fix missing return statement in nouveau_ttm_tt_unpopulate



nouveau_ttm_tt_unpopulate() is supposed to return right after calling
ttm_dma_unpopulate() in the case of a coherent buffer. The return
statement was omitted, leading to the pages being unmapped twice. Fix
this.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent c7e873f8

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1572,8 +1572,10 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
		* so use the DMA API for them.
		*/
		if (!nv_device_is_cpu_coherent(device) &&
		ttm->caching_state == tt_uncached)
		ttm->caching_state == tt_uncached) {
		ttm_dma_unpopulate(ttm_dma, dev->dev);
		return;
		}

		#if __OS_HAS_AGP
		if (drm->agp.stat == ENABLED) {