projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d191c3d
)
drm/nouveau: fix dma_address check for CPU/GPU sync
author
Christian König
<christian.koenig@amd.com>
Fri, 11 Jun 2021 12:34:50 +0000
(14:34 +0200)
committer
Sasha Levin
<sashal@kernel.org>
Wed, 7 Jul 2021 12:22:46 +0000
(08:22 -0400)
[ 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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bo.c
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index
7daa12e
..
b4946b5
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_bo.c
@@
-590,7
+590,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 */
@@
-610,7
+610,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 */