From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Christian König" <christian.koenig@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Sasha Levin" <sashal@kernel.org>
Subject: [PATCH 5.10 3/7] drm/nouveau: fix dma_address check for CPU/GPU sync
Date: Mon, 5 Jul 2021 06:59:53 -0400 [thread overview]
Message-ID: <20210705105957.1513284-4-sashal@kernel.org> (raw)
In-Reply-To: <20210705105957.1513284-1-sashal@kernel.org>
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 7daa12eec01b..b4946b595d86 100644
--- 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 */
--
2.30.2
next prev parent reply other threads:[~2021-07-05 11:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 10:59 [PATCH 5.10 0/7] 5.10.48-rc1 review Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 1/7] scsi: sr: Return appropriate error code when disk is ejected Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 2/7] gpio: mxc: Fix disabled interrupt wake-up support Sasha Levin
2021-07-05 10:59 ` Sasha Levin [this message]
2021-07-05 10:59 ` [PATCH 5.10 4/7] gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 5/7] RDMA/mlx5: Block FDB rules when not in switchdev mode Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 6/7] Revert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack" Sasha Levin
2021-07-05 10:59 ` [PATCH 5.10 7/7] Linux 5.10.48-rc1 Sasha Levin
2021-07-05 16:23 ` [PATCH 5.10 0/7] 5.10.48-rc1 review Fox Chen
2021-07-05 17:43 ` Pavel Machek
2021-07-07 12:28 ` Sasha Levin
2021-07-05 18:35 ` Jon Hunter
2021-07-05 20:38 ` Guenter Roeck
2021-07-06 2:01 ` Samuel Zou
2021-07-07 12:29 ` Sasha Levin
2021-07-06 5:00 ` Naresh Kamboju
2021-07-06 15:14 ` Sudip Mukherjee
2021-07-07 12:29 ` Sasha Levin
2021-07-06 22:44 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210705105957.1513284-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=christian.koenig@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.