iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: add cyan_skillfish asic type

Browse Source 
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>
This commit is contained in:
Tao Zhou 2021-07-13 17:13:48 -04:00 committed by Alex Deucher
parent 30ebc16aac
commit d0f56dc25a
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@ -116,6 +116,7 @@ const char *amdgpu_asic_name[] = {
"RENOIR", "RENOIR",
"ALDEBARAN", "ALDEBARAN",
"NAVI10", "NAVI10",
"CYAN_SKILLFISH",
"NAVI14", "NAVI14",
"NAVI12", "NAVI12",
"SIENNA_CICHLID", "SIENNA_CICHLID",
@ -1439,6 +1440,10 @@ static int amdgpu_device_init_apu_flags(struct amdgpu_device *adev)
break; break;
case CHIP_YELLOW_CARP: case CHIP_YELLOW_CARP:
break; break;
case CHIP_CYAN_SKILLFISH:
if (adev->pdev->device == 0x13FE)
adev->apu_flags |= AMD_APU_IS_CYAN_SKILLFISH2;
break;
default: default:
return -EINVAL; return -EINVAL;
} }

1
drivers/gpu/drm/amd/include/amd_shared.h
View File

@ -47,6 +47,7 @@ enum amd_apu_flags {
AMD_APU_IS_RENOIR = 0x00000008UL, AMD_APU_IS_RENOIR = 0x00000008UL,
AMD_APU_IS_GREEN_SARDINE = 0x00000010UL, AMD_APU_IS_GREEN_SARDINE = 0x00000010UL,
AMD_APU_IS_VANGOGH = 0x00000020UL, AMD_APU_IS_VANGOGH = 0x00000020UL,
AMD_APU_IS_CYAN_SKILLFISH2 = 0x00000040UL,
}; };
/** /**

17
include/drm/amd_asic_type.h
View File

@ -53,14 +53,15 @@ enum amd_asic_type {
CHIP_RENOIR, /* 24 */ CHIP_RENOIR, /* 24 */
CHIP_ALDEBARAN, /* 25 */ CHIP_ALDEBARAN, /* 25 */
CHIP_NAVI10, /* 26 */ CHIP_NAVI10, /* 26 */
CHIP_NAVI14, /* 27 */ CHIP_CYAN_SKILLFISH, /* 27 */
CHIP_NAVI12, /* 28 */ CHIP_NAVI14, /* 28 */
CHIP_SIENNA_CICHLID, /* 29 */ CHIP_NAVI12, /* 29 */
CHIP_NAVY_FLOUNDER, /* 30 */ CHIP_SIENNA_CICHLID, /* 30 */
CHIP_VANGOGH, /* 31 */ CHIP_NAVY_FLOUNDER, /* 31 */
CHIP_DIMGREY_CAVEFISH, /* 32 */ CHIP_VANGOGH, /* 32 */
CHIP_BEIGE_GOBY, /* 33 */ CHIP_DIMGREY_CAVEFISH, /* 33 */
CHIP_YELLOW_CARP, /* 34 */ CHIP_BEIGE_GOBY, /* 34 */
CHIP_YELLOW_CARP, /* 35 */
CHIP_LAST, CHIP_LAST,
}; };