drm/amd/amdgpu: add support for IP version 11.5.2

This initializes drm/amd/amdgpu version 11.5.2

Signed-off-by: YING LI <yingli12@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 998a5e48ba0d1e9f65f87d3186830a2775feeba6..a4258127083d00003f251fd7723694a3e472532f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2020,6 +2020,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(11, 0, 12):
        case IP_VERSION(11, 0, 13):
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
                amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
                break;
        case IP_VERSION(11, 0, 8):
@@ -2084,6 +2085,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(11, 0, 12):
        case IP_VERSION(11, 0, 13):
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
                amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);
                break;
        case IP_VERSION(12, 0, 0):
@@ -2931,6 +2933,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(11, 0, 10):
        case IP_VERSION(11, 0, 11):
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 9):
        case IP_VERSION(13, 0, 10):

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 48b55dae624123c6724bfab48449f0bbe9289190..94f5e5e0d1d680399478783ad30e50f53c4d9fae 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -193,6 +193,7 @@ static int psp_early_init(struct amdgpu_ip_block *ip_block)
        case IP_VERSION(11, 0, 9):
        case IP_VERSION(11, 0, 11):
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
        case IP_VERSION(11, 0, 12):
        case IP_VERSION(11, 0, 13):
                psp_v11_0_set_psp_funcs(psp);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index cf700824b960b7ace8aa43f677ee64f3490ecd23..3d9e9fdc10b478886e653ee980f25c77f995a7c0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -1216,6 +1216,7 @@ static const char *amdgpu_ucode_legacy_naming(struct amdgpu_device *adev, int bl
                case IP_VERSION(11, 0, 13):
                        return "beige_goby";
                case IP_VERSION(11, 5, 0):
+               case IP_VERSION(11, 5, 2):
                        return "vangogh";
                case IP_VERSION(12, 0, 1):
                        return "green_sardine";

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 47db483c35169443b73dc72a44e39bb4d30c79d9..8d84dff58b7ef36da8ad0b4988bf0d5ab8a958f9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -454,6 +454,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)
 
        switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
        case IP_VERSION(13, 0, 5):

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 2395f1856962ad02a209bbf9e695bdfb96c07ef8..bb5dfc410a667fc226154968b5134b395e51792d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -129,6 +129,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                err = psp_init_ta_microcode(psp, ucode_prefix);
                break;
        case IP_VERSION(11, 5, 0):
+       case IP_VERSION(11, 5, 2):
                err = psp_init_asd_microcode(psp, ucode_prefix);
                if (err)
                        return err;