drm/amdgpu: add cyan_skillfish asic type

Add cyan_skillfish asic family.

Signed-off-by: Tao Zhou <tao.zhou1@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_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5d2453c..ba7b193 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -116,6 +116,7 @@ const char *amdgpu_asic_name[] = {
        "RENOIR",
        "ALDEBARAN",
        "NAVI10",
+       "CYAN_SKILLFISH",
        "NAVI14",
        "NAVI12",
        "SIENNA_CICHLID",
@@ -1439,6 +1440,10 @@ static int amdgpu_device_init_apu_flags(struct amdgpu_device *adev)
                break;
        case CHIP_YELLOW_CARP:
                break;
+       case CHIP_CYAN_SKILLFISH:
+               if (adev->pdev->device == 0x13FE)
+                       adev->apu_flags |= AMD_APU_IS_CYAN_SKILLFISH2;
+               break;
        default:
                return -EINVAL;
        }

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index ff1d3d4..257f280 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -47,6 +47,7 @@ enum amd_apu_flags {
        AMD_APU_IS_RENOIR = 0x00000008UL,
        AMD_APU_IS_GREEN_SARDINE = 0x00000010UL,
        AMD_APU_IS_VANGOGH = 0x00000020UL,
+       AMD_APU_IS_CYAN_SKILLFISH2 = 0x00000040UL,
 };
 
 /**

diff --git a/include/drm/amd_asic_type.h b/include/drm/amd_asic_type.h
index 0bf0ad8..0f66a0d 100644 (file)
--- a/include/drm/amd_asic_type.h
+++ b/include/drm/amd_asic_type.h
@@ -53,14 +53,15 @@ enum amd_asic_type {
        CHIP_RENOIR,    /* 24 */
        CHIP_ALDEBARAN, /* 25 */
        CHIP_NAVI10,    /* 26 */
-       CHIP_NAVI14,    /* 27 */
-       CHIP_NAVI12,    /* 28 */
-       CHIP_SIENNA_CICHLID,    /* 29 */
-       CHIP_NAVY_FLOUNDER,     /* 30 */
-       CHIP_VANGOGH,   /* 31 */
-       CHIP_DIMGREY_CAVEFISH,  /* 32 */
-       CHIP_BEIGE_GOBY,        /* 33 */
-       CHIP_YELLOW_CARP,       /* 34 */
+       CHIP_CYAN_SKILLFISH,    /* 27 */
+       CHIP_NAVI14,    /* 28 */
+       CHIP_NAVI12,    /* 29 */
+       CHIP_SIENNA_CICHLID,    /* 30 */
+       CHIP_NAVY_FLOUNDER,     /* 31 */
+       CHIP_VANGOGH,   /* 32 */
+       CHIP_DIMGREY_CAVEFISH,  /* 33 */
+       CHIP_BEIGE_GOBY,        /* 34 */
+       CHIP_YELLOW_CARP,       /* 35 */
        CHIP_LAST,
 };