OSDN Git Service

drm/amdgpu: add PSP SW init support for Arcturus
authorJohn Clements <John.Clements@amd.com>
Thu, 1 Aug 2019 10:05:50 +0000 (18:05 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 2 Aug 2019 15:30:39 +0000 (10:30 -0500)
Add arcturus cases to psp init sewquence.

Signed-off-by: John Clements <john.clements@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

index 1f9105a..24fefd1 100644 (file)
@@ -53,6 +53,7 @@ static int psp_early_init(void *handle)
                psp->autoload_supported = false;
                break;
        case CHIP_VEGA20:
+       case CHIP_ARCTURUS:
                psp_v11_0_set_psp_funcs(psp);
                psp->autoload_supported = false;
                break;
index 2ccd948..40f1971 100644 (file)
@@ -45,6 +45,8 @@ MODULE_FIRMWARE("amdgpu/navi10_sos.bin");
 MODULE_FIRMWARE("amdgpu/navi10_asd.bin");
 MODULE_FIRMWARE("amdgpu/navi14_sos.bin");
 MODULE_FIRMWARE("amdgpu/navi14_asd.bin");
+MODULE_FIRMWARE("amdgpu/arcturus_sos.bin");
+MODULE_FIRMWARE("amdgpu/arcturus_asd.bin");
 
 /* address block */
 #define smnMP1_FIRMWARE_FLAGS          0x3010024
@@ -164,6 +166,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                break;
        case CHIP_NAVI10:
        case CHIP_NAVI14:
+       case CHIP_ARCTURUS:
                break;
        default:
                BUG();