]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu/psp_v13.0: convert to IP version checking
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 4 Aug 2021 19:01:33 +0000 (15:01 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 4 Oct 2021 19:23:00 +0000 (15:23 -0400)
Use IP versions rather than asic_type to differentiate
IP version specific features.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c

index 47a500f64db2052901f6845f5206700f26735ded..64b52c5ea9816a0bcbed392754c2e16f06c0a077 100644 (file)
@@ -47,18 +47,19 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
        const char *chip_name;
        int err = 0;
 
-       switch (adev->asic_type) {
-       case CHIP_ALDEBARAN:
+       switch (adev->ip_versions[MP0_HWIP]) {
+       case IP_VERSION(13, 0, 2):
                chip_name = "aldebaran";
                break;
-       case CHIP_YELLOW_CARP:
+       case IP_VERSION(13, 0, 1):
+       case IP_VERSION(13, 0, 3):
                chip_name = "yellow_carp";
                break;
        default:
                BUG();
        }
-       switch (adev->asic_type) {
-       case CHIP_ALDEBARAN:
+       switch (adev->ip_versions[MP0_HWIP]) {
+       case IP_VERSION(13, 0, 2):
                err = psp_init_sos_microcode(psp, chip_name);
                if (err)
                        return err;
@@ -66,7 +67,8 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)
                if (err)
                        return err;
                break;
-       case CHIP_YELLOW_CARP:
+       case IP_VERSION(13, 0, 1):
+       case IP_VERSION(13, 0, 3):
                err = psp_init_asd_microcode(psp, chip_name);
                if (err)
                        return err;