diff options
| author | Huang Rui <ray.huang@amd.com> | 2021-07-28 17:00:53 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-07-28 22:15:44 -0400 |
| commit | b8e42844b48d441589eb18ade29dee29bbd78657 (patch) | |
| tree | 3a89d42bfd92149d98802c175ee53c21b9c21bc3 /drivers | |
| parent | 8d35a2596164c1c9d34d4656fd42b445cd1e247f (diff) | |
| download | linux-stable-b8e42844b48d441589eb18ade29dee29bbd78657.tar.gz linux-stable-b8e42844b48d441589eb18ade29dee29bbd78657.tar.bz2 linux-stable-b8e42844b48d441589eb18ade29dee29bbd78657.zip | |
drm/amdgpu: enable psp front door loading by default for cyan_skillfish2
The function is ready on psp firmware, and enable it by default.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c index e001875ea1b7..5fdeceaa979f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c @@ -410,10 +410,11 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) else return AMDGPU_FW_LOAD_PSP; case CHIP_CYAN_SKILLFISH: - if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 && - load_type > 1) + if (!(load_type && + adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)) + return AMDGPU_FW_LOAD_DIRECT; + else return AMDGPU_FW_LOAD_PSP; - return AMDGPU_FW_LOAD_DIRECT; default: DRM_ERROR("Unknown firmware load type\n"); } |