amdgpu: Add support for Polaris 12
Subsystems (2)
cover amdgpu: Add support for Polaris 12
This patch set adds support for Polaris 12 GPUs.
Junwei Zhang (3):
drm/amd/amdgpu: add Polaris12 support (v2)
drm/amdgpu/powerplay: add Polaris12 support
drm/amd/amdgpu: add Polaris12 PCI ID
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 ++++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 13 ++++++--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 31 ++++++++++++++++++---- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +++++ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 5 ++-- drivers/gpu/drm/amd/amdgpu/vi.c | 11 ++++++++ drivers/gpu/drm/amd/include/amd_shared.h | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 ++- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 + 16 files changed, 92 insertions(+), 12 deletions(-)
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1482173058-31244-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 1/3 drm/amd/amdgpu: add Polaris12 support (v2)
From: Junwei Zhang <[email protected]>
v2: agd: squash in various fixes
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Christian König <[email protected]>
Reviewed-by Ken Wang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 13 ++++++++++--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 31 +++++++++++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/vi.c | 11 +++++++++++ drivers/gpu/drm/amd/include/amd_shared.h | 1 + 11 files changed, 80 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +6 -0
@@ -840,6 +840,12 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,else if (type ==CGS_UCODE_ID_SMU_SK )strcpy (fw_name,"amdgpu/polaris10_smc_sk.bin" );break ; +case CHIP_POLARIS12 : +if (type ==CGS_UCODE_ID_SMU ) +strcpy (fw_name,"amdgpu/polaris12_smc.bin" ); +else if (type ==CGS_UCODE_ID_SMU_SK ) +strcpy (fw_name,"amdgpu/polaris12_smc_sk.bin" ); +break ;default :DRM_ERROR ("SMC firmware not supported\n" );return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -0
@@ -73,6 +73,7 @@ static const char *amdgpu_asic_name[] = {"STONEY" ,"POLARIS10" ,"POLARIS11" , +"POLARIS12" , "LAST", };
@@ -1277,6 +1278,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev)case CHIP_FIJI :case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :case CHIP_CARRIZO :case CHIP_STONEY :if (adev->asic_type ==CHIP_CARRIZO || adev->asic_type ==CHIP_STONEY )
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -0
@@ -65,6 +65,7 @@#define FIRMWARE_STONEY "amdgpu/stoney_uvd.bin"#define FIRMWARE_POLARIS10 "amdgpu/polaris10_uvd.bin"#define FIRMWARE_POLARIS11 "amdgpu/polaris11_uvd.bin" +#define FIRMWARE_POLARIS12 "amdgpu/polaris12_uvd.bin"/** * amdgpu_uvd_cs_ctx - Command submission parser context
@@ -98,6 +99,7 @@ MODULE_FIRMWARE(FIRMWARE_FIJI);MODULE_FIRMWARE (FIRMWARE_STONEY );MODULE_FIRMWARE (FIRMWARE_POLARIS10 );MODULE_FIRMWARE (FIRMWARE_POLARIS11 ); +MODULE_FIRMWARE (FIRMWARE_POLARIS12 );static void amdgpu_uvd_idle_work_handler (struct work_struct *work);
@@ -149,6 +151,9 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)case CHIP_POLARIS11 : fw_name =FIRMWARE_POLARIS11 ;break ; +case CHIP_POLARIS12 : + fw_name =FIRMWARE_POLARIS12 ; +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +5 -0
@@ -52,6 +52,7 @@#define FIRMWARE_STONEY "amdgpu/stoney_vce.bin"#define FIRMWARE_POLARIS10 "amdgpu/polaris10_vce.bin"#define FIRMWARE_POLARIS11 "amdgpu/polaris11_vce.bin" +#define FIRMWARE_POLARIS12 "amdgpu/polaris12_vce.bin"#ifdef CONFIG_DRM_AMDGPU_CIK MODULE_FIRMWARE (FIRMWARE_BONAIRE );
@@ -66,6 +67,7 @@ MODULE_FIRMWARE(FIRMWARE_FIJI);MODULE_FIRMWARE (FIRMWARE_STONEY );MODULE_FIRMWARE (FIRMWARE_POLARIS10 );MODULE_FIRMWARE (FIRMWARE_POLARIS11 ); +MODULE_FIRMWARE (FIRMWARE_POLARIS12 );static void amdgpu_vce_idle_work_handler (struct work_struct *work);
@@ -121,6 +123,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)case CHIP_POLARIS11 : fw_name =FIRMWARE_POLARIS11 ;break ; +case CHIP_POLARIS12 : + fw_name =FIRMWARE_POLARIS12 ; +break ;default :return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +10 -3
@@ -167,6 +167,7 @@ static void dce_v11_0_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(stoney_golden_settings_a11));break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :amdgpu_program_register_sequence (adev, polaris11_golden_settings_a11, (const u32 )ARRAY_SIZE (polaris11_golden_settings_a11));
@@ -608,6 +609,7 @@ static int dce_v11_0_get_num_crtc (struct amdgpu_device *adev) num_crtc =6 ;break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : num_crtc =5 ;break ;default :
@@ -1589,6 +1591,7 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev) adev->mode_info.audio.num_pins =8 ;break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : adev->mode_info.audio.num_pins =6 ;break ;default :
@@ -2388,7 +2391,8 @@ static u32 dce_v11_0_pick_pll(struct drm_crtc *crtc)int pll;if ((adev->asic_type ==CHIP_POLARIS10 ) || - (adev->asic_type ==CHIP_POLARIS11 )) { + (adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 )) {struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (amdgpu_crtc->encoder);struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
@@ -2822,7 +2826,8 @@ static int dce_v11_0_crtc_mode_set(struct drm_crtc *crtc,return -EINVAL ;if ((adev->asic_type ==CHIP_POLARIS10 ) || - (adev->asic_type ==CHIP_POLARIS11 )) { + (adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 )) {struct amdgpu_encoder *amdgpu_encoder =to_amdgpu_encoder (amdgpu_crtc->encoder); int encoder_mode =
@@ -2992,6 +2997,7 @@ static int dce_v11_0_early_init(void *handle) adev->mode_info.num_dig =6 ;break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : adev->mode_info.num_hpd =5 ; adev->mode_info.num_dig =5 ;break ;
@@ -3101,7 +3107,8 @@ static int dce_v11_0_hw_init(void *handle)amdgpu_atombios_crtc_powergate_init (adev);amdgpu_atombios_encoder_init_dig (adev);if ((adev->asic_type ==CHIP_POLARIS10 ) || - (adev->asic_type ==CHIP_POLARIS11 )) { + (adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 )) {amdgpu_atombios_crtc_set_dce_clock (adev, adev->clock.default_dispclk,DCE_CLOCK_TYPE_DISPCLK ,ATOM_GCK_DFS ); amdgpu_atombios_crtc_set_dce_clock(adev, 0,
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +26 -5
@@ -139,6 +139,13 @@ MODULE_FIRMWARE("amdgpu/polaris10_mec.bin");MODULE_FIRMWARE ("amdgpu/polaris10_mec2.bin" );MODULE_FIRMWARE ("amdgpu/polaris10_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_ce.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_me.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_mec2.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_rlc.bin" ); +static const struct amdgpu_gds_reg_offset amdgpu_gds_reg_offset[] = { {mmGDS_VMID0_BASE, mmGDS_VMID0_SIZE, mmGDS_GWS_VMID0, mmGDS_OA_VMID0},
@@ -689,6 +696,7 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(tonga_golden_common_all));break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :amdgpu_program_register_sequence (adev, golden_settings_polaris11_a11, (const u32 )ARRAY_SIZE (golden_settings_polaris11_a11));
@@ -903,6 +911,9 @@ static int gfx_v8_0_init_microcode(struct amdgpu_device *adev)case CHIP_POLARIS10 : chip_name ="polaris10" ;break ; +case CHIP_POLARIS12 : + chip_name ="polaris12" ; +break ;case CHIP_STONEY : chip_name ="stoney" ;break ;
@@ -1768,6 +1779,7 @@ static int gfx_v8_0_gpu_early_init(struct amdgpu_device *adev) gb_addr_config =TONGA_GB_ADDR_CONFIG_GOLDEN ;break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : ret =amdgpu_atombios_get_gfx_info (adev);if (ret)return ret;
@@ -2682,6 +2694,7 @@ static void gfx_v8_0_tiling_mode_table_init(struct amdgpu_device *adev)break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : modearray[0] = (ARRAY_MODE(ARRAY_2D_TILED_THIN1) | PIPE_CONFIG(ADDR_SURF_P4_16x16) | TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
@@ -3503,6 +3516,7 @@ gfx_v8_0_raster_config(struct amdgpu_device *adev, u32 *rconf, u32 *rconf1) *rconf1 |=0x0 ;break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 : *rconf |=RB_MAP_PKR0 (2 ) |RB_XSEL2 (1 ) |SE_MAP (2 ) |SE_XSEL (1 ) |SE_YSEL (1 ); *rconf1 |=0x0 ;
@@ -4021,7 +4035,8 @@ static void gfx_v8_0_init_pg(struct amdgpu_device *adev)cz_enable_cp_power_gating (adev, true); elsecz_enable_cp_power_gating (adev ,false ); - }else if (adev->asic_type ==CHIP_POLARIS11 ) { + }else if ((adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 )) {gfx_v8_0_init_csb (adev);gfx_v8_0_init_save_restore_list (adev);gfx_v8_0_enable_save_restore_machine (adev);
@@ -4095,7 +4110,8 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev) RLC_CGCG_CGLS_CTRL__CGLS_EN_MASK);WREG32 (mmRLC_CGCG_CGLS_CTRL, tmp);if (adev->asic_type ==CHIP_POLARIS11 || - adev->asic_type ==CHIP_POLARIS10 ) { + adev->asic_type ==CHIP_POLARIS10 || + adev->asic_type ==CHIP_POLARIS12 ) { tmp =RREG32 (mmRLC_CGCG_CGLS_CTRL_3D); tmp &= ~0x3 ;WREG32 (mmRLC_CGCG_CGLS_CTRL_3D, tmp);
@@ -4283,6 +4299,7 @@ static int gfx_v8_0_cp_gfx_start(struct amdgpu_device *adev)amdgpu_ring_write (ring,0x0000002A );break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :amdgpu_ring_write (ring,0x16000012 );amdgpu_ring_write (ring,0x00000000 );break ;
@@ -4664,7 +4681,8 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev) (adev->asic_type == CHIP_FIJI) || (adev->asic_type == CHIP_STONEY) || (adev->asic_type == CHIP_POLARIS11) || - (adev->asic_type == CHIP_POLARIS10)) { + (adev->asic_type == CHIP_POLARIS10) || + (adev->asic_type == CHIP_POLARIS12)) {WREG32 (mmCP_MEC_DOORBELL_RANGE_LOWER,AMDGPU_DOORBELL_KIQ <<2 ); WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER,
@@ -4700,7 +4718,8 @@ static int gfx_v8_0_cp_compute_resume(struct amdgpu_device *adev) mqd->cp_hqd_persistent_state = tmp;if (adev->asic_type ==CHIP_STONEY || adev->asic_type ==CHIP_POLARIS11 || - adev->asic_type ==CHIP_POLARIS10 ) { + adev->asic_type ==CHIP_POLARIS10 || + adev->asic_type ==CHIP_POLARIS12 ) { tmp =RREG32 (mmCP_ME1_PIPE3_INT_CNTL); tmp =REG_SET_FIELD (tmp,CP_ME1_PIPE3_INT_CNTL ,GENERIC2_INT_ENABLE ,1 );WREG32 (mmCP_ME1_PIPE3_INT_CNTL, tmp);
@@ -5279,7 +5298,8 @@ static int gfx_v8_0_late_init(void *handle)static void gfx_v8_0_enable_gfx_static_mg_power_gating (struct amdgpu_device *adev,bool enable) { -if (adev->asic_type ==CHIP_POLARIS11 ) +if ((adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 ))/* Send msg to SMU via Powerplay */ amdgpu_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_SMC,
@@ -5353,6 +5373,7 @@ static int gfx_v8_0_set_powergating_state(void *handle,gfx_v8_0_enable_gfx_dynamic_mg_power_gating (adev, false);break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :if ((adev->pg_flags &AMD_PG_SUPPORT_GFX_SMG ) && enable)gfx_v8_0_enable_gfx_static_mg_power_gating (adev, true);else
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +5 -0
@@ -46,6 +46,7 @@ static int gmc_v8_0_wait_for_idle(void *handle);MODULE_FIRMWARE ("amdgpu/tonga_mc.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_mc.bin" );MODULE_FIRMWARE ("amdgpu/polaris10_mc.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_mc.bin" );static const u32 golden_settings_tonga_a11[] = {
@@ -130,6 +131,7 @@ static void gmc_v8_0_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(golden_settings_tonga_a11));break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :amdgpu_program_register_sequence (adev, golden_settings_polaris11_a11, (const u32 )ARRAY_SIZE (golden_settings_polaris11_a11));
@@ -225,6 +227,9 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)case CHIP_POLARIS10 : chip_name ="polaris10" ;break ; +case CHIP_POLARIS12 : + chip_name ="polaris12" ; +break ;case CHIP_FIJI :case CHIP_CARRIZO :case CHIP_STONEY :
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +6 -0
@@ -60,6 +60,8 @@ MODULE_FIRMWARE("amdgpu/polaris10_sdma.bin");MODULE_FIRMWARE ("amdgpu/polaris10_sdma1.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_sdma.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_sdma1.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_sdma.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_sdma1.bin" ); static const u32 sdma_offsets[SDMA_MAX_INSTANCE] =
@@ -206,6 +208,7 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(golden_settings_tonga_a11));break ;case CHIP_POLARIS11 : +case CHIP_POLARIS12 :amdgpu_program_register_sequence (adev, golden_settings_polaris11_a11, (const u32 )ARRAY_SIZE (golden_settings_polaris11_a11));
@@ -278,6 +281,9 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)case CHIP_POLARIS10 : chip_name ="polaris10" ;break ; +case CHIP_POLARIS12 : + chip_name ="polaris12" ; +break ;case CHIP_CARRIZO : chip_name ="carrizo" ;break ;
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3 -2
@@ -320,11 +320,12 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev) {u32 tmp; -/* Fiji, Stoney, Polaris10, Polaris11 are single pipe */ +/* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */ if ((adev->asic_type ==CHIP_FIJI ) || (adev->asic_type ==CHIP_STONEY ) || (adev->asic_type ==CHIP_POLARIS10 ) || - (adev->asic_type ==CHIP_POLARIS11 )) + (adev->asic_type ==CHIP_POLARIS11 ) || + (adev->asic_type ==CHIP_POLARIS12 ))return AMDGPU_VCE_HARVEST_VCE1 ;/* Tonga and CZ are dual or single pipe */
drivers/gpu/drm/amd/amdgpu/vi.c +11 -0
@@ -88,6 +88,8 @@ MODULE_FIRMWARE("amdgpu/polaris10_smc.bin");MODULE_FIRMWARE ("amdgpu/polaris10_smc_sk.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_smc.bin" );MODULE_FIRMWARE ("amdgpu/polaris11_smc_sk.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_smc.bin" ); +MODULE_FIRMWARE ("amdgpu/polaris12_smc_sk.bin" );/* * Indirect registers accessor
@@ -312,6 +314,7 @@ static void vi_init_golden_registers(struct amdgpu_device *adev)break ;case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :default :break ; }
@@ -671,6 +674,7 @@ static int vi_read_register(struct amdgpu_device *adev, u32 se_num,case CHIP_TONGA :case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :case CHIP_CARRIZO :case CHIP_STONEY : asic_register_table = cz_allowed_read_registers;
@@ -994,6 +998,11 @@ static int vi_common_early_init(void *handle) adev->pg_flags =0 ; adev->external_rev_id = adev->rev_id +0x50 ;break ; +case CHIP_POLARIS12 : + adev->cg_flags =AMD_CG_SUPPORT_UVD_MGCG ; + adev->pg_flags =0 ; + adev->external_rev_id = adev->rev_id +0x64 ; +break ;case CHIP_CARRIZO : adev->cg_flags =AMD_CG_SUPPORT_UVD_MGCG | AMD_CG_SUPPORT_GFX_MGCG |
@@ -1346,6 +1355,7 @@ static int vi_common_set_clockgating_state(void *handle,case CHIP_TONGA :case CHIP_POLARIS10 :case CHIP_POLARIS11 : +case CHIP_POLARIS12 :vi_common_set_clockgating_state_by_smu (adev, state);default :break ;
@@ -1429,6 +1439,7 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)break ;case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :amdgpu_ip_block_add (adev, &vi_common_ip_block);amdgpu_ip_block_add (adev, &gmc_v8_1_ip_block);amdgpu_ip_block_add (adev, &tonga_ih_ip_block);
drivers/gpu/drm/amd/include/amd_shared.h +1 -0
@@ -46,6 +46,7 @@ enum amd_asic_type {CHIP_STONEY ,CHIP_POLARIS10 ,CHIP_POLARIS11 , +CHIP_POLARIS12 , CHIP_LAST, };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu/powerplay: add Polaris12 support
In reply to a message not in the archiveFrom: Junwei Zhang <[email protected]>
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Christian König <[email protected]>
Reviewed-by Ken Wang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 ++- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 2 +- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +1 -0
@@ -98,6 +98,7 @@ static int amdgpu_pp_early_init(void *handle)switch (adev->asic_type) {case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :case CHIP_TONGA :case CHIP_FIJI :case CHIP_TOPAZ :
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +2 -1
@@ -95,6 +95,7 @@ int hwmgr_init(struct amd_pp_init *pp_init, struct pp_instance *handle)break ;case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :polaris_set_asic_special_caps (hwmgr); hwmgr->feature_mask &= ~(PP_UVD_HANDSHAKE_MASK );break ;
@@ -745,7 +746,7 @@ int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_TablelessHardwareInterface); -if (hwmgr->chip_id ==CHIP_POLARIS11 ) +if ((hwmgr->chip_id ==CHIP_POLARIS11 ) || (hwmgr->chip_id ==CHIP_POLARIS12 ))phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_SPLLShutdownSupport);return 0 ;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c +1 -1
@@ -521,7 +521,7 @@ int smu7_enable_didt_config(struct pp_hwmgr *hwmgr) PP_ASSERT_WITH_CODE((result == 0), "DIDT Config failed.", return result); result =smu7_program_pt_config_registers (hwmgr, DIDTConfig_Polaris10); PP_ASSERT_WITH_CODE((result == 0), "DIDT Config failed.", return result); - }else if (hwmgr->chip_id ==CHIP_POLARIS11 ) { + }else if ((hwmgr->chip_id ==CHIP_POLARIS11 ) || (hwmgr->chip_id ==CHIP_POLARIS12 )) { result =smu7_program_pt_config_registers (hwmgr, GCCACConfig_Polaris11); PP_ASSERT_WITH_CODE((result == 0), "DIDT Config failed.", return result); result =smu7_program_pt_config_registers (hwmgr, DIDTConfig_Polaris11);
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +1 -0
@@ -65,6 +65,7 @@ int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)break ;case CHIP_POLARIS11 :case CHIP_POLARIS10 : +case CHIP_POLARIS12 :polaris10_smum_init (smumgr);break ;default :
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/amdgpu: add Polaris12 PCI ID
In reply to a message not in the archiveFrom: Junwei Zhang <[email protected]>
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Reviewed-by Christian König <[email protected]>
Reviewed-by Ken Wang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +7 -0
@@ -418,6 +418,13 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, {0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, {0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, +/* Polaris12 */ + {0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, {0, 0, 0} };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx