drm/amdgpu: make cyan skillfish support code more consistent

Since this is an existing asic, adjust the code to follow
the same logic as previously so the driver state is consistent.

No functional change intended.

Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index aff9d70347ad105b4fcb2a7d10dc7b495cf779cc..6d4d59458cfff025bd0401587022d93d0bc90d5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1452,7 +1452,8 @@ static int amdgpu_device_init_apu_flags(struct amdgpu_device *adev)
        case CHIP_YELLOW_CARP:
                break;
        case CHIP_CYAN_SKILLFISH:
-               if (adev->pdev->device == 0x13FE)
+               if ((adev->pdev->device == 0x13FE) ||
+                   (adev->pdev->device == 0x143F))
                        adev->apu_flags |= AMD_APU_IS_CYAN_SKILLFISH2;
                break;
        default:

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 5cdafdcfec59ca5cf1ba9e52496f60fbde66de7f..a0b5cf9a41cccf6c3a787f440a67b767dc64f688 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1923,6 +1923,7 @@ static const struct pci_device_id pciidlist[] = {
 
        /* CYAN_SKILLFISH */
        {0x1002, 0x13FE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU},
+       {0x1002, 0x143F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU},
 
        /* BEIGE_GOBY */
        {0x1002, 0x7420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 9bc9155cbf0660ea3db9e24a259a98712c42133c..f2806959736a12d047d6fb1d739de35be6062960 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -137,8 +137,7 @@ static int psp_early_init(void *handle)
                psp->autoload_supported = true;
                break;
        case IP_VERSION(11, 0, 8):
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 ||
-                   adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 4)) {
+               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2) {
                        psp_v11_0_8_set_psp_funcs(psp);
                        psp->autoload_supported = false;
                }

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 8fb4528c741f9d27efb4a4e4a0d2ebad6892d960..dfbe65c1ae0bf362b9c90388c166b19c7799967b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3956,14 +3956,12 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
                chip_name = "yellow_carp";
                break;
        case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 1, 4):
                if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
                        chip_name = "cyan_skillfish2";
                else
                        chip_name = "cyan_skillfish";
                break;
-       case IP_VERSION(10, 1, 4):
-               chip_name = "cyan_skillfish2";
-               break;
        default:
                BUG();
        }

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 45e10d5028c579ec3d6a7061588f54c018a51c6f..81e033549dda3bb3f3a1d6c681f480d86f113c12 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -264,8 +264,7 @@ static int sdma_v5_0_init_microcode(struct amdgpu_device *adev)
                chip_name = "navi12";
                break;
        case IP_VERSION(5, 0, 1):
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 ||
-                   adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 4))
+               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)
                        chip_name = "cyan_skillfish2";
                else
                        chip_name = "cyan_skillfish";