drm/amdgpu: add autoload_supported check for RLC autoload
authorLang Yu <Lang.Yu@amd.com>
Mon, 12 Jul 2021 02:51:15 +0000 (10:51 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 23 Jul 2021 14:08:02 +0000 (10:08 -0400)
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

index 26334d5..9f3d82d 100644 (file)
@@ -5435,7 +5435,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)