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

Commit cf5eb820 authored by Christian König's avatar Christian König Committed by Sasha Levin
Browse files

drm/nouveau: fix dma_address check for CPU/GPU sync 



[ Upstream commit d330099115597bbc238d6758a4930e72b49ea9ba ]

AGP for example doesn't have a dma_address array.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210614110517.1624-1-christian.koenig@amd.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3edfd34f

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) 
	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;



	/* Don't waste time looping if the object is coherent */
@@ -562,7 +562,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) 
	struct ttm_dma_tt *ttm_dma = (struct ttm_dma_tt *)nvbo->bo.ttm;

	int i;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;



	/* Don't waste time looping if the object is coherent */