From: Liu ChengZhe <ChengZhe.Liu@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: "Jack Xiao" <Jack.Xiao@amd.com>, "Feifei Xu" <Feifei.Xu@amd.com>,
"Kevin Wang" <Kevin1.Wang@amd.com>,
"Liu ChengZhe" <ChengZhe.Liu@amd.com>,
"Tuikov Luben" <Luben.Tuikov@amd.com>,
"Deucher Alexander" <Alexander.Deucher@amd.com>,
"Xiaojie Yuan" <xiaojie.yuan@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Hawking Zhang" <Hawking.Zhang@amd.com>
Subject: [PATCH] drm/amdgpu: fix PSP autoload twice in FLR
Date: Mon, 27 Jul 2020 19:03:42 +0800 [thread overview]
Message-ID: <20200727110342.401382-1-ChengZhe.Liu@amd.com> (raw)
the block->status.hw = false assignment will overwrite PSP's previous
hw status, which will cause PSP execute resume operation after hw init.
Signed-off-by: Liu ChengZhe <ChengZhe.Liu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 62ecac97fbd2..88c681957d39 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2574,6 +2574,10 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)
AMD_IP_BLOCK_TYPE_IH,
};
+ for (i = 0; i < adev->num_ip_blocks; i++) {
+ adev->ip_blocks[i].status.hw = false;
+ }
+
for (i = 0; i < ARRAY_SIZE(ip_order); i++) {
int j;
struct amdgpu_ip_block *block;
@@ -2581,7 +2585,6 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)
for (j = 0; j < adev->num_ip_blocks; j++) {
block = &adev->ip_blocks[j];
- block->status.hw = false;
if (block->version->type != ip_order[i] ||
!block->status.valid)
continue;
--
2.25.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next reply other threads:[~2020-07-27 11:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 11:03 Liu ChengZhe [this message]
2020-07-27 19:16 ` [PATCH] drm/amdgpu: fix PSP autoload twice in FLR Luben Tuikov
-- strict thread matches above, loose matches on Subject: below --
2020-07-29 8:50 Liu ChengZhe
2020-07-29 14:18 ` Luben Tuikov
2020-07-28 2:29 Liu ChengZhe
2020-07-28 18:04 ` Luben Tuikov
2020-07-28 18:48 ` Luben Tuikov
2020-07-29 8:44 ` Liu, Cheng Zhe
2020-07-24 9:28 Liu ChengZhe
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=20200727110342.401382-1-ChengZhe.Liu@amd.com \
--to=chengzhe.liu@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Feifei.Xu@amd.com \
--cc=Hawking.Zhang@amd.com \
--cc=Jack.Xiao@amd.com \
--cc=Kevin1.Wang@amd.com \
--cc=Luben.Tuikov@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=xiaojie.yuan@amd.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox