Add Picasso support
Subsystems (3)
cover Add Picasso support
This patch set adds support for Picasso. Picasso is a new APU similar to raven.
Alex Deucher (1):
drm/amdgpu: use IP presence to free uvd and vce handles
Huang Rui (2):
drm/amdgpu: add ip blocks for picasso (v2)
drm/amdgpu: add new raven series device
Kenneth Feng (5):
drm/amdgpu: Add pg support for gfxoff for PCO drm/amdgpu: Enable SDMA power gating for PCO drm/amdgpu: enable mmhub power gating
drm/amdgpu: enable vcn powergating for PCO
drm/amdgpu: enable gfxoff in non-sriov and stutter mode by default
Likun Gao (13):
drm/amdgpu: add picasso to asic_type enum drm/amdgpu: add soc15 support for picasso drm/amdgpu: add picasso support for vm drm/amd/display/dm: add picasso support drm/amdgpu: Add support of powerplay for picasso drm/amdgpu: initilize picasso psp firmwares support drm/amdgpu: add picasso ucode loading method drm/amdgpu: add picasso support for vcn drm/amdgpu: add clockgating support for picasso drm/amdgpu: add picasso support for gmc drm/amdgpu: add picasso support for gfx_v9_0 drm/amdgpu: add picasso support for sdma_v4 drm/amdgpu: add picasso for amdgpu kms
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 30 ++- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 231 +-------------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 - drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 4 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 46 ++++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 8 +- include/drm/amd_asic_type.h | 1 + 18 files changed, 133 insertions(+), 244 deletions(-)
Signature · 6 lines
2.13.6 _______________________________________________ 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): 20180912185632.30062-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 1/21 drm/amdgpu: add picasso to asic_type enum
From: Likun Gao <[email protected]>
Add picasso to amd_asic_type enum and amdgpu_asic_name[].
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + include/drm/amd_asic_type.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -89,6 +89,7 @@ static const char *amdgpu_asic_name[] = {"VEGA12" ,"VEGA20" ,"RAVEN" , +"PICASSO" , "LAST", };
include/drm/amd_asic_type.h +1 -0
@@ -49,6 +49,7 @@ enum amd_asic_type {CHIP_VEGA12 ,CHIP_VEGA20 ,CHIP_RAVEN , +CHIP_PICASSO , CHIP_LAST, };
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/21 drm/amdgpu: add soc15 support for picasso
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add the IP blocks, clock and powergating flags, and common clockgating support.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 ++++++- drivers/gpu/drm/amd/amdgpu/soc15.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +6 -1
@@ -62,6 +62,7 @@MODULE_FIRMWARE ("amdgpu/vega10_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/vega12_gpu_info.bin" );MODULE_FIRMWARE ("amdgpu/raven_gpu_info.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_gpu_info.bin" );#define AMDGPU_RESUME_MS 2000
@@ -1335,6 +1336,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)case CHIP_RAVEN : chip_name ="raven" ;break ; +case CHIP_PICASSO : + chip_name ="picasso" ; +break ; }snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_gpu_info.bin" , chip_name);
@@ -1460,7 +1464,8 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : -if (adev->asic_type ==CHIP_RAVEN ) +case CHIP_PICASSO : +if ((adev->asic_type ==CHIP_RAVEN ) || (adev->asic_type ==CHIP_PICASSO )) adev->family =AMDGPU_FAMILY_RV ;else adev->family =AMDGPU_FAMILY_AI ;
drivers/gpu/drm/amd/amdgpu/soc15.c +21 -0
@@ -486,6 +486,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)case CHIP_VEGA10 :case CHIP_VEGA12 :case CHIP_RAVEN : +case CHIP_PICASSO :vega10_reg_base_init (adev);break ;case CHIP_VEGA20 :
@@ -724,6 +725,25 @@ static int soc15_common_early_init(void *handle) adev->external_rev_id =0x1 ;break ; +case CHIP_PICASSO : + adev->cg_flags =AMD_CG_SUPPORT_GFX_MGLS | +AMD_CG_SUPPORT_GFX_CP_LS | +AMD_CG_SUPPORT_GFX_3D_CGCG | +AMD_CG_SUPPORT_GFX_3D_CGLS | +AMD_CG_SUPPORT_GFX_CGCG | +AMD_CG_SUPPORT_GFX_CGLS | +AMD_CG_SUPPORT_BIF_LS | +AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_ROM_MGCG | +AMD_CG_SUPPORT_MC_MGCG | +AMD_CG_SUPPORT_MC_LS | +AMD_CG_SUPPORT_SDMA_MGCG | +AMD_CG_SUPPORT_SDMA_LS ; + + adev->pg_flags =0 ; + + adev->external_rev_id = adev->rev_id +0x41 ; +break ;default :/* FIXME: not supported yet */ return -EINVAL ;
@@ -924,6 +944,7 @@ static int soc15_common_set_clockgating_state(void *handle, state == AMD_CG_STATE_GATE ? true : false);break ;case CHIP_RAVEN : +case CHIP_PICASSO : adev->nbio_funcs->update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ? true : false); adev->nbio_funcs->update_medium_grain_light_sleep(adev,
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/21 drm/amdgpu: add picasso support for vm
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add vm support for picasso.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
@@ -2776,7 +2776,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &AMDGPU_VM_USE_CPU_FOR_COMPUTE ); -if (adev->asic_type ==CHIP_RAVEN ) +if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) vm->pte_support_ats = true; }else { vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &
@@ -2868,7 +2868,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,*/ int amdgpu_vm_make_compute (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned int pasid) { -bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN ); +bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO );int r; r =amdgpu_bo_reserve (vm->root.base.bo, true);
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/21 drm/amd/display/dm: add picasso support
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add support for picasso to the display manager.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -0
@@ -2177,6 +2177,7 @@ bool amdgpu_device_asic_has_dc_support(enum amd_asic_type asic_type)case CHIP_VEGA20 :#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN : +case CHIP_PICASSO :#endif return amdgpu_dc !=0 ;#endif
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -2
@@ -1124,7 +1124,8 @@ static int dce110_register_irq_handlers(struct amdgpu_device *adev)if (adev->asic_type ==CHIP_VEGA10 || adev->asic_type ==CHIP_VEGA12 || adev->asic_type ==CHIP_VEGA20 || - adev->asic_type ==CHIP_RAVEN ) + adev->asic_type ==CHIP_RAVEN || + adev->asic_type ==CHIP_PICASSO ) client_id =SOC15_IH_CLIENTID_DCE ; int_params.requested_polarity =INTERRUPT_POLARITY_DEFAULT ;
@@ -1543,6 +1544,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)break ;#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN : +case CHIP_PICASSO :if (dcn10_register_irq_handlers (dm->adev)) {DRM_ERROR ("DM: Failed to initialize IRQ\n" ); goto fail;
@@ -1773,6 +1775,7 @@ static int dm_early_init(void *handle)break ;#if defined(CONFIG_DRM_AMD_DC_DCN1_0 )case CHIP_RAVEN : +case CHIP_PICASSO : adev->mode_info.num_crtc =4 ; adev->mode_info.num_hpd =4 ; adev->mode_info.num_dig =4 ;
@@ -2021,7 +2024,8 @@ static int fill_plane_attributes_from_fb(struct amdgpu_device *adev,if (adev->asic_type ==CHIP_VEGA10 || adev->asic_type ==CHIP_VEGA12 || adev->asic_type ==CHIP_VEGA20 || - adev->asic_type ==CHIP_RAVEN ) { + adev->asic_type ==CHIP_RAVEN || + adev->asic_type ==CHIP_PICASSO ) {/* Fill GFX9 params */ plane_state->tiling_info.gfx9.num_pipes = adev->gfx.config.gb_addr_config_fields.num_pipes;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/21 drm/amdgpu: Add support of powerplay for picasso
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
add powerplay support for picasso, treat it the same as raven now.
--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -0
@@ -171,6 +171,7 @@ int hwmgr_early_init(struct pp_hwmgr *hwmgr)case AMDGPU_FAMILY_RV :switch (hwmgr->chip_id) {case CHIP_RAVEN : +case CHIP_PICASSO : hwmgr->od_enabled = false; hwmgr->smumgr_funcs = &smu10_smu_funcs;smu10_init_function_pointers (hwmgr);
drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c +4 -4
@@ -832,7 +832,7 @@ static const ATOM_PPLIB_POWERPLAYTABLE *get_powerplay_table(uint16_t size;if (!table_addr) { -if (hwmgr->chip_id ==CHIP_RAVEN ) { +if (hwmgr->chip_id ==CHIP_RAVEN || hwmgr->chip_id ==CHIP_PICASSO ) { table_addr = &soft_dummy_pp_table[0 ]; hwmgr->soft_pp_table = &soft_dummy_pp_table[0 ]; hwmgr->soft_pp_table_size =sizeof (soft_dummy_pp_table);
@@ -1055,7 +1055,7 @@ static int init_overdrive_limits(struct pp_hwmgr *hwmgr, hwmgr->platform_descriptor.maxOverdriveVDDC =0 ; hwmgr->platform_descriptor.overdriveVDDCStep =0 ; -if (hwmgr->chip_id ==CHIP_RAVEN ) +if (hwmgr->chip_id ==CHIP_RAVEN || hwmgr->chip_id ==CHIP_PICASSO )return 0 ;/* We assume here that fw_info is unchanged if this call fails.*/
@@ -1595,7 +1595,7 @@ static int pp_tables_initialize(struct pp_hwmgr *hwmgr)int result;const ATOM_PPLIB_POWERPLAYTABLE *powerplay_table; -if (hwmgr->chip_id ==CHIP_RAVEN ) +if (hwmgr->chip_id ==CHIP_RAVEN || hwmgr->chip_id ==CHIP_PICASSO )return 0 ; hwmgr->need_pp_table_upload = true;
@@ -1644,7 +1644,7 @@ static int pp_tables_initialize(struct pp_hwmgr *hwmgr)static int pp_tables_uninitialize (struct pp_hwmgr *hwmgr) { -if (hwmgr->chip_id ==CHIP_RAVEN ) +if (hwmgr->chip_id ==CHIP_RAVEN || hwmgr->chip_id ==CHIP_PICASSO )return 0 ;kfree (hwmgr->dyn_state.vddc_dependency_on_sclk);
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/21 drm/amdgpu: initilize picasso psp firmwares support
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Same as raven for now.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 4 ++++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
@@ -56,6 +56,7 @@ static int psp_sw_init(void *handle)psp_v3_1_set_psp_funcs (psp);break ;case CHIP_RAVEN : +case CHIP_PICASSO :psp_v10_0_set_psp_funcs (psp);break ;case CHIP_VEGA20 :
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +4 -0
@@ -35,6 +35,7 @@#include "sdma0/sdma0_4_1_offset.h" MODULE_FIRMWARE ("amdgpu/raven_asd.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_asd.bin" );static int psp_v10_0_get_fw_type (struct amdgpu_firmware_info *ucode,enum psp_gfx_fw_type *type)
@@ -113,6 +114,9 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)case CHIP_RAVEN : chip_name ="raven" ;break ; +case CHIP_PICASSO : + chip_name ="picasso" ; +break ;default :BUG (); }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/21 drm/amdgpu: add picasso ucode loading method
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Same as raven.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -0
@@ -303,6 +303,7 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)return AMDGPU_FW_LOAD_SMU ;case CHIP_VEGA10 :case CHIP_RAVEN : +case CHIP_PICASSO :case CHIP_VEGA12 :case CHIP_VEGA20 :if (!load_type)
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/21 drm/amdgpu: add picasso support for vcn
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add vcn support for picasso.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +5 -0
@@ -42,8 +42,10 @@/* Firmware Names */ #define FIRMWARE_RAVEN "amdgpu/raven_vcn.bin" +#define FIRMWARE_PICASSO "amdgpu/picasso_vcn.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN ); +MODULE_FIRMWARE (FIRMWARE_PICASSO );static void amdgpu_vcn_idle_work_handler (struct work_struct *work);
@@ -61,6 +63,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)case CHIP_RAVEN : fw_name =FIRMWARE_RAVEN ;break ; +case CHIP_PICASSO : + fw_name =FIRMWARE_PICASSO ; +break ;default :return -EINVAL ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/21 drm/amdgpu: add clockgating support for picasso
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Treat it the same as raven for now.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +6 -5
@@ -621,7 +621,7 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *ad def = data =RREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG); -if (adev->asic_type !=CHIP_RAVEN ) { +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO ) { def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2); def2 = data2 =RREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2); }else
@@ -637,7 +637,7 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *adDAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK | DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK); -if (adev->asic_type !=CHIP_RAVEN ) +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO ) data2 &= ~(DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -654,7 +654,7 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *adDAGB0_CNTL_MISC2__DISABLE_TLBWR_CG_MASK | DAGB0_CNTL_MISC2__DISABLE_TLBRD_CG_MASK); -if (adev->asic_type !=CHIP_RAVEN ) +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO ) data2 |= (DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -667,13 +667,13 @@ static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *adWREG32_SOC15 (MMHUB ,0 , mmATC_L2_MISC_CG, data);if (def1 != data1) { -if (adev->asic_type !=CHIP_RAVEN ) +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO )WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2, data1);else WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_RV, data1); } -if (adev->asic_type !=CHIP_RAVEN && def2 != data2) +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO && def2 != data2)WREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2, data2); }
@@ -737,6 +737,7 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : +case CHIP_PICASSO :mmhub_v1_0_update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ? true : false); athub_update_medium_grain_clock_gating(adev,
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/21 drm/amdgpu: add picasso support for gmc
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Same as raven.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -0
@@ -846,6 +846,7 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev) adev->gmc.gart_size =512ULL <<20 ;break ;case CHIP_RAVEN :/* DCE SG support */ +case CHIP_PICASSO :/* DCE SG support */ adev->gmc.gart_size =1024ULL <<20 ;break ; }
@@ -934,6 +935,7 @@ static int gmc_v9_0_sw_init(void *handle) adev->gmc.vram_type =amdgpu_atomfirmware_get_vram_type (adev);switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_PICASSO :if (adev->rev_id ==0x0 || adev->rev_id ==0x1 ) {amdgpu_vm_adjust_size (adev,256 *1024 ,9 ,3 ,48 ); }else {
@@ -1060,6 +1062,7 @@ static void gmc_v9_0_init_golden_registers(struct amdgpu_device *adev)case CHIP_VEGA12 :break ;case CHIP_RAVEN : +case CHIP_PICASSO :soc15_program_register_sequence (adev, golden_settings_athub_1_0_0,ARRAY_SIZE (golden_settings_athub_1_0_0));
@@ -1094,6 +1097,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_PICASSO :mmhub_v1_0_initialize_power_gating (adev);mmhub_v1_0_update_power_gating (adev, true);break ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/21 drm/amdgpu: add picasso support for gfx_v9_0
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add gfx support to picasso
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +27 -3
@@ -80,6 +80,13 @@ MODULE_FIRMWARE("amdgpu/raven_mec.bin");MODULE_FIRMWARE ("amdgpu/raven_mec2.bin" );MODULE_FIRMWARE ("amdgpu/raven_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_ce.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_me.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_mec2.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_rlc.bin" ); +static const struct soc15_reg_golden golden_settings_gc_9_0[] = {SOC15_REG_GOLDEN_VALUE (GC ,0 , mmDB_DEBUG2,0xf00fffff ,0x00000400 ),
@@ -240,6 +247,7 @@ static const u32 GFX_RLC_SRM_INDEX_CNTL_DATA_OFFSETS[] =#define VEGA10_GB_ADDR_CONFIG_GOLDEN 0x2a114042#define VEGA12_GB_ADDR_CONFIG_GOLDEN 0x24104041#define RAVEN_GB_ADDR_CONFIG_GOLDEN 0x24000042 +#define PICASSO_GB_ADDR_CONFIG_GOLDEN 0x24000042static void gfx_v9_0_set_ring_funcs (struct amdgpu_device *adev);static void gfx_v9_0_set_irq_funcs (struct amdgpu_device *adev);
@@ -279,6 +287,7 @@ static void gfx_v9_0_init_golden_registers(struct amdgpu_device *adev) ARRAY_SIZE(golden_settings_gc_9_0_vg20));break ;case CHIP_RAVEN : +case CHIP_PICASSO :soc15_program_register_sequence (adev, golden_settings_gc_9_1,ARRAY_SIZE (golden_settings_gc_9_1));
@@ -566,6 +575,9 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN : chip_name ="raven" ;break ; +case CHIP_PICASSO : + chip_name ="picasso" ; +break ;default :BUG (); }
@@ -1019,7 +1031,7 @@ static int gfx_v9_0_rlc_init(struct amdgpu_device *adev)amdgpu_bo_unreserve (adev->gfx.rlc.clear_state_obj); } -if (adev->asic_type ==CHIP_RAVEN ) { +if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) {/* TODO: double check the cp_table_size for RV */ adev->gfx.rlc.cp_table_size =ALIGN (96 *5 *4 ,2048 ) + (64 *1024 );/* JT + GDS */ r = amdgpu_bo_create_reserved(adev, adev->gfx.rlc.cp_table_size,
@@ -1268,6 +1280,14 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev) adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ; gb_addr_config =RAVEN_GB_ADDR_CONFIG_GOLDEN ;break ; +case CHIP_PICASSO : + adev->gfx.config.max_hw_contexts =8 ; + adev->gfx.config.sc_prim_fifo_size_frontend =0x20 ; + adev->gfx.config.sc_prim_fifo_size_backend =0x100 ; + adev->gfx.config.sc_hiz_tile_fifo_size =0x30 ; + adev->gfx.config.sc_earlyz_tile_fifo_size =0x4C0 ; + gb_addr_config =PICASSO_GB_ADDR_CONFIG_GOLDEN ; +break ;default :BUG ();break ;
@@ -1546,6 +1566,7 @@ static int gfx_v9_0_sw_init(void *handle)case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : +case CHIP_PICASSO : adev->gfx.mec.num_mec =2 ;break ;default :
@@ -1707,7 +1728,7 @@ static int gfx_v9_0_sw_fini(void *handle)amdgpu_bo_free_kernel (&adev->gfx.rlc.clear_state_obj, &adev->gfx.rlc.clear_state_gpu_addr, (void **)&adev->gfx.rlc.cs_ptr); -if (adev->asic_type ==CHIP_RAVEN ) { +if ((adev->asic_type ==CHIP_RAVEN ) || (adev->asic_type ==CHIP_PICASSO )) {amdgpu_bo_free_kernel (&adev->gfx.rlc.cp_table_obj, &adev->gfx.rlc.cp_table_gpu_addr, (void **)&adev->gfx.rlc.cp_table_ptr);
@@ -2373,7 +2394,7 @@ static int gfx_v9_0_rlc_resume(struct amdgpu_device *adev)return r; } -if (adev->asic_type ==CHIP_RAVEN ) { +if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) {if (amdgpu_lbpw !=0 )gfx_v9_0_enable_lbpw (adev, true);else
@@ -3777,6 +3798,7 @@ static int gfx_v9_0_set_powergating_state(void *handle,switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_PICASSO :if (!enable) {amdgpu_gfx_off_ctrl (adev, false);cancel_delayed_work_sync (&adev->gfx.gfx_off_delay_work);
@@ -3831,6 +3853,7 @@ static int gfx_v9_0_set_clockgating_state(void *handle,case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : +case CHIP_PICASSO :gfx_v9_0_update_gfx_clock_gating (adev, state ==AMD_CG_STATE_GATE ? true : false);break ;
@@ -4840,6 +4863,7 @@ static void gfx_v9_0_set_rlc_funcs(struct amdgpu_device *adev)case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : +case CHIP_PICASSO : adev->gfx.rlc.funcs = &gfx_v9_0_rlc_funcs;break ;default :
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/21 drm/amdgpu: add picasso support for sdma_v4
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add sdma support to picasso
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +9 -1
@@ -48,6 +48,7 @@ MODULE_FIRMWARE("amdgpu/vega12_sdma1.bin");MODULE_FIRMWARE ("amdgpu/vega20_sdma.bin" );MODULE_FIRMWARE ("amdgpu/vega20_sdma1.bin" );MODULE_FIRMWARE ("amdgpu/raven_sdma.bin" ); +MODULE_FIRMWARE ("amdgpu/picasso_sdma.bin" );#define SDMA0_POWER_CNTL__ON_OFF_CONDITION_HOLD_TIME_MASK 0x000000F8L#define SDMA0_POWER_CNTL__ON_OFF_STATUS_DURATION_TIME_MASK 0xFC000000L
@@ -221,6 +222,7 @@ static void sdma_v4_0_init_golden_registers(struct amdgpu_device *adev) ARRAY_SIZE(golden_settings_sdma1_4_2));break ;case CHIP_RAVEN : +case CHIP_PICASSO :soc15_program_register_sequence (adev, golden_settings_sdma_4_1,ARRAY_SIZE (golden_settings_sdma_4_1));
@@ -269,6 +271,9 @@ static int sdma_v4_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN : chip_name ="raven" ;break ; +case CHIP_PICASSO : + chip_name ="picasso" ; +break ;default :BUG (); }
@@ -849,6 +854,7 @@ static void sdma_v4_0_init_pg(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_PICASSO :sdma_v4_1_init_power_gating (adev);sdma_v4_1_update_power_gating (adev, true);break ;
@@ -1256,7 +1262,7 @@ static int sdma_v4_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_RAVEN ) +if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) adev->sdma.num_instances =1 ;else adev->sdma.num_instances =2 ;
@@ -1599,6 +1605,7 @@ static int sdma_v4_0_set_clockgating_state(void *handle,case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : +case CHIP_PICASSO :sdma_v4_0_update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ? true : false); sdma_v4_0_update_medium_grain_light_sleep(adev,
@@ -1617,6 +1624,7 @@ static int sdma_v4_0_set_powergating_state(void *handle,switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_PICASSO :sdma_v4_1_update_power_gating (adev, state ==AMD_PG_STATE_GATE ? true : false);break ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/21 drm/amdgpu: add picasso for amdgpu kms
In reply to a message not in the archiveFrom: Likun Gao <[email protected]>
Add picasso for amdgpu kms
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +1 -1
@@ -974,7 +974,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,pm_runtime_get_sync (dev->dev); -if (adev->asic_type !=CHIP_RAVEN ) { +if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO ) {amdgpu_uvd_free_handles (adev, file_priv);amdgpu_vce_free_handles (adev, file_priv); }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/21 drm/amdgpu: Add pg support for gfxoff for PCO
In reply to a message not in the archiveFrom: Kenneth Feng <[email protected]>
Add pg support for gfxoff.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +4 -1
@@ -740,7 +740,10 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS ; - adev->pg_flags =0 ; +if (adev->powerplay.pp_feature &PP_GFXOFF_MASK ) + adev->pg_flags |=AMD_PG_SUPPORT_GFX_PG | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_RLC_SMU_HS ; adev->external_rev_id = adev->rev_id +0x41 ;break ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/21 drm/amdgpu: Enable SDMA power gating for PCO
In reply to a message not in the archiveFrom: Kenneth Feng <[email protected]>
Enable SDMA power gating
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -0
@@ -740,6 +740,8 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA ; +if (adev->powerplay.pp_feature &PP_GFXOFF_MASK ) adev->pg_flags |=AMD_PG_SUPPORT_GFX_PG | AMD_PG_SUPPORT_CP |
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/21 drm/amdgpu: enable mmhub power gating
In reply to a message not in the archiveFrom: Kenneth Feng <[email protected]>
Remove some functions due to the design change. All the mmhub power gating sequence is moved to smu fw.Driver sends the message to enable mmhub powergating.We can also skip the fw version check since the old fw version is in a very early stage and we don't use that fw for release.
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 - drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 220 -------------------------------- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 1 - drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +- 4 files changed, 1 insertion(+), 223 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -1
@@ -1098,7 +1098,6 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_RAVEN :case CHIP_PICASSO : -mmhub_v1_0_initialize_power_gating (adev);mmhub_v1_0_update_power_gating (adev, true);break ;default :
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +0 -220
236 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h +0 -1
@@ -32,7 +32,6 @@ void mmhub_v1_0_init(struct amdgpu_device *adev);int mmhub_v1_0_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state);void mmhub_v1_0_get_clockgating (struct amdgpu_device *adev,u32 *flags); -void mmhub_v1_0_initialize_power_gating (struct amdgpu_device *adev);void mmhub_v1_0_update_power_gating (struct amdgpu_device *adev,bool enable);
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
@@ -740,7 +740,7 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_MMHUB ;if (adev->powerplay.pp_feature &PP_GFXOFF_MASK ) adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/21 drm/amdgpu: enable vcn powergating for PCO
In reply to a message not in the archiveFrom: Kenneth Feng <[email protected]>
enable vcn pg
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -1
@@ -740,7 +740,9 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_MMHUB ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA | +AMD_PG_SUPPORT_MMHUB | +AMD_PG_SUPPORT_VCN ;if (adev->powerplay.pp_feature &PP_GFXOFF_MASK ) adev->pg_flags |= AMD_PG_SUPPORT_GFX_PG |
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/21 drm/amdgpu: add ip blocks for picasso (v2)
In reply to a message not in the archiveFrom: Huang Rui <[email protected]>
Add PCO IPs.
V2: enable VCN as well
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +18 -0
@@ -556,6 +556,24 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v1_0_ip_block);break ; +case CHIP_PICASSO : +amdgpu_device_ip_block_add (adev, &vega10_common_ip_block); +amdgpu_device_ip_block_add (adev, &gmc_v9_0_ip_block); +amdgpu_device_ip_block_add (adev, &vega10_ih_ip_block); +amdgpu_device_ip_block_add (adev, &psp_v10_0_ip_block); +amdgpu_device_ip_block_add (adev, &pp_smu_ip_block); +if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev)) +amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC ) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#else +# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15." +#endif +amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block); +amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block); +amdgpu_device_ip_block_add (adev, &vcn_v1_0_ip_block); +break ;default :return -EINVAL ; }
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/21 drm/amdgpu: add new raven series device
In reply to a message not in the archiveFrom: Huang Rui <[email protected]>
This patch is to add new pci device for raven series.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -0
@@ -874,6 +874,8 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},/* Raven */ {0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, +/* Picasso */ + {0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PICASSO|AMD_IS_APU}, {0, 0, 0} };
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/21 drm/amdgpu: enable gfxoff in non-sriov and stutter mode by default
In reply to a message not in the archiveFrom: Kenneth Feng <[email protected]>
enable gfxoff in non-sriov and stutter mode by default
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -0
@@ -1492,6 +1492,8 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) } adev->powerplay.pp_feature = amdgpu_pp_feature_mask; +if (amdgpu_sriov_vf (adev)) + adev->powerplay.pp_feature &= ~PP_GFXOFF_MASK ;for (i =0 ; i < adev->num_ip_blocks; i++) {if ((amdgpu_ip_block_mask & (1 << i)) ==0 ) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -2
@@ -114,8 +114,8 @@ uint amdgpu_pg_mask = 0xffffffff;uint amdgpu_sdma_phase_quantum =32 ;char *amdgpu_disable_cu =NULL ;char *amdgpu_virtual_display =NULL ; -/* OverDrive(bit 14),gfxoff(bit 15),stutter mode(bit 17) disabled by default*/ -uint amdgpu_pp_feature_mask =0xfffd3fff ; +/* OverDrive(bit 14) disabled by default*/ +uint amdgpu_pp_feature_mask =0xffffbfff ;int amdgpu_ngg =0 ;int amdgpu_prim_buf_per_se =0 ;int amdgpu_pos_buf_per_se =0 ;
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/21 drm/amdgpu: use IP presence to free uvd and vce handles
In reply to a message not in the archiveRather than checking the asic type, check whether the UVD or VCE IP blocks exist. This way we don't have to update the check with new asics that use VCN.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +2 -2
@@ -974,10 +974,10 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,pm_runtime_get_sync (dev->dev); -if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO ) { +if (amdgpu_device_ip_get_ip_block (adev,AMD_IP_BLOCK_TYPE_UVD ) !=NULL )amdgpu_uvd_free_handles (adev, file_priv); +if (amdgpu_device_ip_get_ip_block (adev,AMD_IP_BLOCK_TYPE_VCE ) !=NULL )amdgpu_vce_free_handles (adev, file_priv); - }amdgpu_vm_bo_rmv (adev, fpriv->prt_va);
Signature · 6 lines
2.13.6 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx