Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tao Zhou and committed by
Alex Deucher
d0f56dc2 30ebc16a

+15 -8
+5
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
··· 116 116 "RENOIR", 117 117 "ALDEBARAN", 118 118 "NAVI10", 119 + "CYAN_SKILLFISH", 119 120 "NAVI14", 120 121 "NAVI12", 121 122 "SIENNA_CICHLID", ··· 1439 1438 adev->apu_flags |= AMD_APU_IS_VANGOGH; 1440 1439 break; 1441 1440 case CHIP_YELLOW_CARP: 1441 + break; 1442 + case CHIP_CYAN_SKILLFISH: 1443 + if (adev->pdev->device == 0x13FE) 1444 + adev->apu_flags |= AMD_APU_IS_CYAN_SKILLFISH2; 1442 1445 break; 1443 1446 default: 1444 1447 return -EINVAL;
+1
drivers/gpu/drm/amd/include/amd_shared.h
··· 47 47 AMD_APU_IS_RENOIR = 0x00000008UL, 48 48 AMD_APU_IS_GREEN_SARDINE = 0x00000010UL, 49 49 AMD_APU_IS_VANGOGH = 0x00000020UL, 50 + AMD_APU_IS_CYAN_SKILLFISH2 = 0x00000040UL, 50 51 }; 51 52 52 53 /**
+9 -8
include/drm/amd_asic_type.h
··· 53 53 CHIP_RENOIR, /* 24 */ 54 54 CHIP_ALDEBARAN, /* 25 */ 55 55 CHIP_NAVI10, /* 26 */ 56 - CHIP_NAVI14, /* 27 */ 57 - CHIP_NAVI12, /* 28 */ 58 - CHIP_SIENNA_CICHLID, /* 29 */ 59 - CHIP_NAVY_FLOUNDER, /* 30 */ 60 - CHIP_VANGOGH, /* 31 */ 61 - CHIP_DIMGREY_CAVEFISH, /* 32 */ 62 - CHIP_BEIGE_GOBY, /* 33 */ 63 - CHIP_YELLOW_CARP, /* 34 */ 56 + CHIP_CYAN_SKILLFISH, /* 27 */ 57 + CHIP_NAVI14, /* 28 */ 58 + CHIP_NAVI12, /* 29 */ 59 + CHIP_SIENNA_CICHLID, /* 30 */ 60 + CHIP_NAVY_FLOUNDER, /* 31 */ 61 + CHIP_VANGOGH, /* 32 */ 62 + CHIP_DIMGREY_CAVEFISH, /* 33 */ 63 + CHIP_BEIGE_GOBY, /* 34 */ 64 + CHIP_YELLOW_CARP, /* 35 */ 64 65 CHIP_LAST, 65 66 }; 66 67