drm/amdgpu/psp11: add psp support for navi12

Same as other navi asics.

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 314e7cbabc87c610d099445515294c756daef825..d1ac73eca06aa9b9ae5ff5cd22915e29db1b9c4a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -59,6 +59,7 @@ static int psp_early_init(void *handle)
                break;
        case CHIP_NAVI10:
        case CHIP_NAVI14:
+       case CHIP_NAVI12:
                psp_v11_0_set_psp_funcs(psp);
                psp->autoload_supported = true;
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 38956e41718b336356e8987ad5f09fe8a60d9b74..f0a0ecb0781866fcc5b19e1fc4fec74c69698fe3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -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/navi12_sos.bin");
+MODULE_FIRMWARE("amdgpu/navi12_asd.bin");
 MODULE_FIRMWARE("amdgpu/arcturus_sos.bin");
 MODULE_FIRMWARE("amdgpu/arcturus_asd.bin");
 
@@ -80,6 +82,9 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
        case CHIP_NAVI14:
                chip_name = "navi14";
                break;
+       case CHIP_NAVI12:
+               chip_name = "navi12";
+               break;
        case CHIP_ARCTURUS:
                chip_name = "arcturus";
                break;
@@ -176,6 +181,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                break;
        case CHIP_NAVI10:
        case CHIP_NAVI14:
+       case CHIP_NAVI12:
        case CHIP_ARCTURUS:
                break;
        default: