All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexander.deucher@amd.com>
To: amd-gfx@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Huang Rui <ray.huang@amd.com>, Lang Yu <Lang.Yu@amd.com>
Subject: [PATCH 28/29] drm/amdgpu: add autoload_supported check for RLC autoload
Date: Tue, 20 Jul 2021 11:43:48 -0400	[thread overview]
Message-ID: <20210720154349.1599827-29-alexander.deucher@amd.com> (raw)
In-Reply-To: <20210720154349.1599827-1-alexander.deucher@amd.com>

From: Lang Yu <Lang.Yu@amd.com>

Asic cyan_skilfish2 won't support RLC autoload when using
front door loading. We just use PSP to load firmware like
gfx9 here.

So add autoload_supported flag check instead of just
checking firmware load type for RLC autoload.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index b91f9ad911ce..4e64b92c5e9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -5418,7 +5418,8 @@ static int gfx_v10_0_rlc_resume(struct amdgpu_device *adev)
 {
 	int r;
 
-	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
+	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP &&
+		adev->psp.autoload_supported) {
 
 		r = gfx_v10_0_wait_for_rlc_autoload_complete(adev);
 		if (r)
-- 
2.31.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2021-07-20 15:44 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-20 15:43 [PATCH 00/29] Cyan Skillfish support Alex Deucher
2021-07-20 15:43 ` [PATCH 01/29] drm/amdgpu: increase size for sdma fw name string Alex Deucher
2021-07-20 15:43 ` [PATCH 02/29] drm/amdgpu: adjust fw_name string length for toc Alex Deucher
2021-07-20 15:43 ` [PATCH 03/29] drm/amdgpu: add cyan_skillfish asic type Alex Deucher
2021-07-20 15:43 ` [PATCH 04/29] drm/amdgpu: dynamic initialize ip offset for cyan_skillfish Alex Deucher
2021-07-20 15:43 ` [PATCH 05/29] drm/amdgpu: init family name " Alex Deucher
2021-07-20 15:43 ` [PATCH 06/29] drm/amdgpu: set ip blocks " Alex Deucher
2021-07-20 15:43 ` [PATCH 07/29] drm/amdgpu: add cp/rlc fw loading support " Alex Deucher
2021-07-20 15:43 ` [PATCH 08/29] drm/amdgpu: add sdma " Alex Deucher
2021-07-20 15:43 ` [PATCH 09/29] drm/amdgpu: load fw direclty " Alex Deucher
2021-07-20 15:43 ` [PATCH 10/29] drm/amdgpu: add cyan_skillfish support in gmc v10 Alex Deucher
2021-07-20 15:43 ` [PATCH 11/29] drm/amdgpu: add cyan_skillfish support in gfx v10 Alex Deucher
2021-07-20 15:43 ` [PATCH 12/29] drm/amdgpu: add sdma v5 golden settings for cyan_skillfish Alex Deucher
2021-07-20 15:43 ` [PATCH 13/29] drm/amdgpu: add gc v10 " Alex Deucher
2021-07-20 15:43 ` [PATCH 14/29] drm/amdkfd: enable cyan_skillfish KFD Alex Deucher
2021-07-20 15:43 ` [PATCH 15/29] drm/amdgpu: add chip early init for cyan_skillfish Alex Deucher
2021-07-20 15:43 ` [PATCH 16/29] drm/amdgpu: add nbio support " Alex Deucher
2021-07-20 15:43 ` [PATCH 17/29] drm/amdgpu: add mp 11.0.8 header " Alex Deucher
2021-07-20 15:43 ` [PATCH 18/29] drm/amdgpu: add psp v11.0.8 driver " Alex Deucher
2021-07-20 15:43 ` [PATCH 19/29] drm/amdgpu: init psp v11.0.8 function " Alex Deucher
2021-07-20 15:43 ` [PATCH 20/29] drm/amdgpu: enable psp v11.0.8 " Alex Deucher
2021-07-20 15:43 ` [PATCH 21/29] drm/amdgpu: use direct loading by default for cyan_skillfish2 Alex Deucher
2021-07-20 15:43 ` [PATCH 22/29] drm/amdgpu: add smu_v11_8_pmfw header for cyan_skilfish Alex Deucher
2021-07-20 15:43 ` [PATCH 23/29] drm/amdgpu: add smu_v11_8_ppsmc " Alex Deucher
2021-07-20 15:43 ` [PATCH 24/29] drm/amdgpu: add smu interface " Alex Deucher
2021-07-20 15:43 ` [PATCH 25/29] drm/amdgpu: add basic ppt functions " Alex Deucher
2021-07-20 15:43 ` [PATCH 26/29] drm/amdgpu: add check_fw_version support for cyan_skillfish Alex Deucher
2021-07-20 15:43 ` [PATCH 27/29] drm/amdgpu: enable SMU for cyan_skilfish Alex Deucher
2021-07-20 15:43 ` Alex Deucher [this message]
2021-07-20 15:43 ` [PATCH 29/29] drm/amdgpu: add pci device id for cyan_skillfish Alex Deucher

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=20210720154349.1599827-29-alexander.deucher@amd.com \
    --to=alexander.deucher@amd.com \
    --cc=Lang.Yu@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=ray.huang@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 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.