| From cdc4b91b8de0779e17f4bdb0585539bd98955d11 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 11 Jun 2021 14:34:50 +0200 |
| Subject: drm/nouveau: fix dma_address check for CPU/GPU sync |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Christian König <christian.koenig@amd.com> |
| |
| [ Upstream commit d330099115597bbc238d6758a4930e72b49ea9ba ] |
| |
| AGP for example doesn't have a dma_address array. |
| |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Acked-by: Alex Deucher <alexander.deucher@amd.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20210614110517.1624-1-christian.koenig@amd.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c |
| index 78f520d05de9..58c310930bf2 100644 |
| --- a/drivers/gpu/drm/nouveau/nouveau_bo.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c |
| @@ -458,7 +458,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 */ |
| @@ -478,7 +478,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 */ |
| -- |
| 2.30.2 |
| |