drm/amd: add more cyan skillfish PCI ids
Subsystems (2)
Alex Deucher
maintainerPATCH 1/5 drm/amd: add more cyan skillfish PCI ids
Add additional PCI IDs to the cyan skillfish family.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +5 -0
@@ -2172,6 +2172,11 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x7410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN},/* CYAN_SKILLFISH */ + {0x1002, 0x13DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13F9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, {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},
Signature · 1 line
2.50.1
Alex Deucher
maintainerPATCH 2/5 drm/amdgpu: add ip offset support for cyan skillfish
For chips that don't have IP discovery tables.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- .../drm/amd/amdgpu/cyan_skillfish_reg_init.c | 56 +++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/nv.h | 1 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -84,7 +84,8 @@ amdgpu-y += \ vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o arct_reg_init.o mxgpu_nv.o \ nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o soc21.o soc24.o \ sienna_cichlid.o smu_v13_0_10.o nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o lsdma_v6_0.o \ - nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o nbif_v6_3_1.o + nbio_v7_9.o aqua_vanjaram.o nbio_v7_11.o lsdma_v7_0.o hdp_v7_0.o nbif_v6_3_1.o \ + cyan_skillfish_reg_init.o # add DF block amdgpu-y += \
drivers/gpu/drm/amd/amdgpu/cyan_skillfish_reg_init.c new file +56 -0
56 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/nv.h +1 -0
@@ -31,5 +31,6 @@ extern const struct amdgpu_ip_block_version nv_common_ip_block;void nv_grbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);void nv_set_virt_ops (struct amdgpu_device *adev); +int cyan_skillfish_reg_base_init (struct amdgpu_device *adev);#endif
Signature · 1 line
2.50.1
Alex Deucher
maintainerPATCH 3/5 drm/amdgpu: add support for cyan skillfish without IP discovery
In reply to Alex DeucherFor platforms without an IP discovery table.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +30 -0
@@ -2746,6 +2746,36 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) adev->ip_versions[UVD_HWIP ][1 ] =IP_VERSION (2 ,6 ,0 ); adev->ip_versions[XGMI_HWIP ][0 ] =IP_VERSION (6 ,1 ,0 );break ; +case CHIP_CYAN_SKILLFISH : +if (adev->apu_flags &AMD_APU_IS_CYAN_SKILLFISH2 ) { + r =amdgpu_discovery_reg_base_init (adev); +if (r) +return -EINVAL ; + +amdgpu_discovery_harvest_ip (adev); +amdgpu_discovery_get_gfx_info (adev); +amdgpu_discovery_get_mall_info (adev); +amdgpu_discovery_get_vcn_info (adev); + }else { +cyan_skillfish_reg_base_init (adev); + adev->sdma.num_instances =2 ; + adev->ip_versions[MMHUB_HWIP ][0 ] =IP_VERSION (2 ,0 ,3 ); + adev->ip_versions[ATHUB_HWIP ][0 ] =IP_VERSION (2 ,0 ,3 ); + adev->ip_versions[OSSSYS_HWIP ][0 ] =IP_VERSION (5 ,0 ,1 ); + adev->ip_versions[HDP_HWIP ][0 ] =IP_VERSION (5 ,0 ,1 ); + adev->ip_versions[SDMA0_HWIP ][0 ] =IP_VERSION (5 ,0 ,1 ); + adev->ip_versions[SDMA1_HWIP ][1 ] =IP_VERSION (5 ,0 ,1 ); + adev->ip_versions[DF_HWIP ][0 ] =IP_VERSION (3 ,5 ,0 ); + adev->ip_versions[NBIO_HWIP ][0 ] =IP_VERSION (2 ,1 ,1 ); + adev->ip_versions[UMC_HWIP ][0 ] =IP_VERSION (8 ,1 ,1 ); + adev->ip_versions[MP0_HWIP ][0 ] =IP_VERSION (11 ,0 ,8 ); + adev->ip_versions[MP1_HWIP ][0 ] =IP_VERSION (11 ,0 ,8 ); + adev->ip_versions[THM_HWIP ][0 ] =IP_VERSION (11 ,0 ,1 ); + adev->ip_versions[SMUIO_HWIP ][0 ] =IP_VERSION (11 ,0 ,8 ); + adev->ip_versions[GC_HWIP ][0 ] =IP_VERSION (10 ,1 ,3 ); + adev->ip_versions[UVD_HWIP ][0 ] =IP_VERSION (2 ,0 ,3 ); + } +break ;default : r =amdgpu_discovery_reg_base_init (adev);if (r) {
Signature · 1 line
2.50.1
Alex Deucher
maintainerPATCH 4/5 drm/amdgpu: add support for cyan skillfish gpu_info
In reply to Alex DeucherSome SOCs which are part of the cyan skillfish family rely on an explicit firmware for IP discovery. Add support for the gpu_info firmware.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -0
@@ -95,6 +95,7 @@ MODULE_FIRMWARE("amdgpu/picasso_gpu_info.bin");MODULE_FIRMWARE ("amdgpu/raven2_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/arcturus_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/navi12_gpu_info.bin" ); +MODULE_FIRMWARE ("amdgpu/cyan_skillfish_gpu_info.bin" );#define AMDGPU_RESUME_MS 2000#define AMDGPU_MAX_RETRY_LIMIT 2
@@ -2597,6 +2598,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)return 0 ; chip_name ="navi12" ;break ; +case CHIP_CYAN_SKILLFISH : + chip_name ="cyan_skillfish" ; +break ; } err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw,
Signature · 1 line
2.50.1
Alex Deucher
maintainerPATCH 5/5 drm/amdgpu: don't enable SMU on cyan skillfish
In reply to Alex DeucherCyan skillfish uses different SMU firmware.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +4 -1
@@ -2124,7 +2124,6 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,0 ,5 ):case IP_VERSION (11 ,0 ,9 ):case IP_VERSION (11 ,0 ,7 ): -case IP_VERSION (11 ,0 ,8 ):case IP_VERSION (11 ,0 ,11 ):case IP_VERSION (11 ,0 ,12 ):case IP_VERSION (11 ,0 ,13 ):
@@ -2132,6 +2131,10 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (11 ,5 ,2 ):amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);break ; +case IP_VERSION (11 ,0 ,8 ): +if (adev->apu_flags &AMD_APU_IS_CYAN_SKILLFISH2 ) +amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block); +break ;case IP_VERSION (12 ,0 ,0 ):case IP_VERSION (12 ,0 ,1 ):amdgpu_device_ip_block_add (adev, &smu_v12_0_ip_block);
Signature · 1 line
2.50.1
Ping on this series?
Quoted 27 lines · Alex Deucher
Add additional PCI IDs to the cyan skillfish family.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +5
-1@@ -2172,6 +2172,11 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x7410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN},/* CYAN_SKILLFISH */ + {0x1002, 0x13DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13F9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, + {0x1002, 0x13FC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, {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}, --2.50.1