drm/amdgpu: simplify Raven, Raven2, and Picasso handling
Subsystems (3)
PATCH 1/1 drm/amdgpu: simplify Raven, Raven2, and Picasso handling
Treat them all as Raven rather than adding a new picasso asic type. This simplifies a lot of code and also handles the case of rv2 chips with the 0x15d8 pci id. It also fixes dmcu fw handling for picasso.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- 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 | 7 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 32 ++--------- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 ++-- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +--- drivers/gpu/drm/amd/amdgpu/soc15.c | 66 ++++++++++------------ 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 - 16 files changed, 60 insertions(+), 113 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -7
@@ -91,7 +91,6 @@ static const char *amdgpu_asic_name[] = {"VEGA12" ,"VEGA20" ,"RAVEN" , -"PICASSO" , "LAST", };
@@ -1337,12 +1336,11 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ; }snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_gpu_info.bin" , chip_name);
@@ -1468,8 +1466,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : -case CHIP_PICASSO : -if ((adev->asic_type ==CHIP_RAVEN ) || (adev->asic_type ==CHIP_PICASSO )) +if (adev->asic_type ==CHIP_RAVEN ) adev->family =AMDGPU_FAMILY_RV ;else adev->family =AMDGPU_FAMILY_AI ;
@@ -2183,7 +2180,6 @@ 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/amdgpu/amdgpu_drv.c +1 -2
@@ -874,8 +874,7 @@ 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}, + {0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, {0, 0, 0} };
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -1
@@ -56,7 +56,6 @@ 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/amdgpu_ucode.c +0 -1
@@ -303,7 +303,6 @@ 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)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3 -4
@@ -63,14 +63,13 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_RAVEN : -if (adev->rev_id >=8 ) +if (adev->rev_id >=8 ) fw_name =FIRMWARE_RAVEN2 ; +else if (adev->pdev->device ==0x15d8 ) + fw_name =FIRMWARE_PICASSO ;else fw_name =FIRMWARE_RAVEN ;break ; -case CHIP_PICASSO : - fw_name =FIRMWARE_PICASSO ; -break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
@@ -2981,7 +2981,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 || adev->asic_type ==CHIP_PICASSO ) +if (adev->asic_type ==CHIP_RAVEN ) vm->pte_support_ats = true; }else { vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &
@@ -3073,7 +3073,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 || adev->asic_type ==CHIP_PICASSO ); +bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r; r =amdgpu_bo_reserve (vm->root.base.bo, true);
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5 -27
@@ -277,7 +277,6 @@ 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 0x24000042#define RAVEN2_GB_ADDR_CONFIG_GOLDEN 0x26013041static void gfx_v9_0_set_ring_funcs (struct amdgpu_device *adev);
@@ -329,14 +328,6 @@ static void gfx_v9_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_9_1_rv1, ARRAY_SIZE(golden_settings_gc_9_1_rv1));break ; -case CHIP_PICASSO : -soc15_program_register_sequence (adev, - golden_settings_gc_9_1, -ARRAY_SIZE (golden_settings_gc_9_1)); -soc15_program_register_sequence (adev, - golden_settings_gc_9_1_rv1, -ARRAY_SIZE (golden_settings_gc_9_1_rv1)); -break ;default :break ; }
@@ -617,12 +608,11 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }
@@ -1076,7 +1066,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 || adev->asic_type ==CHIP_PICASSO ) { +if (adev->asic_type ==CHIP_RAVEN ) {/* 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,
@@ -1328,14 +1318,6 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev)else 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 ;
@@ -1614,7 +1596,6 @@ 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 :
@@ -1776,7 +1757,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 ) || (adev->asic_type ==CHIP_PICASSO )) { +if (adev->asic_type ==CHIP_RAVEN ) {amdgpu_bo_free_kernel (&adev->gfx.rlc.cp_table_obj, &adev->gfx.rlc.cp_table_gpu_addr, (void **)&adev->gfx.rlc.cp_table_ptr);
@@ -2442,7 +2423,7 @@ static int gfx_v9_0_rlc_resume(struct amdgpu_device *adev)return r; } -if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) { +if (adev->asic_type ==CHIP_RAVEN ) {if (amdgpu_lbpw !=0 )gfx_v9_0_enable_lbpw (adev, true);else
@@ -3846,7 +3827,6 @@ 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);
@@ -3901,7 +3881,6 @@ 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 ;
@@ -4911,7 +4890,6 @@ 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 :
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0 -4
@@ -846,7 +846,6 @@ 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 ; }
@@ -935,7 +934,6 @@ 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 {
@@ -1062,7 +1060,6 @@ 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));
@@ -1097,7 +1094,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_update_power_gating (adev, true);break ;default :
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +5 -6
@@ -412,7 +412,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 && adev->asic_type !=CHIP_PICASSO ) { +if (adev->asic_type !=CHIP_RAVEN ) { def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2); def2 = data2 =RREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2); }else
@@ -428,7 +428,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN ) data2 &= ~(DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -445,7 +445,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN ) data2 |= (DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |
@@ -458,13 +458,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN )WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2, data1);else WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_RV, data1); } -if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO && def2 != data2) +if (adev->asic_type !=CHIP_RAVEN && def2 != data2)WREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2, data2); }
@@ -528,7 +528,6 @@ 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,
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +2 -3
@@ -121,12 +121,11 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)case CHIP_RAVEN :if (adev->rev_id >=0x8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -8
@@ -229,7 +229,6 @@ 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));
@@ -283,12 +282,11 @@ static int sdma_v4_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }
@@ -869,7 +867,6 @@ 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 ;
@@ -1277,7 +1274,7 @@ static int sdma_v4_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) +if (adev->asic_type ==CHIP_RAVEN ) adev->sdma.num_instances =1 ;else adev->sdma.num_instances =2 ;
@@ -1620,7 +1617,6 @@ 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,
@@ -1639,7 +1635,6 @@ 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 ;
drivers/gpu/drm/amd/amdgpu/soc15.c +30 -36
107 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -6
@@ -1213,8 +1213,7 @@ 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_PICASSO ) + adev->asic_type ==CHIP_RAVEN ) client_id =SOC15_IH_CLIENTID_DCE ; int_params.requested_polarity =INTERRUPT_POLARITY_DEFAULT ;
@@ -1633,7 +1632,6 @@ 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;
@@ -1864,7 +1862,6 @@ 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 ;
@@ -2113,8 +2110,7 @@ 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_PICASSO ) { + adev->asic_type ==CHIP_RAVEN ) {/* Fill GFX9 params */ plane_state->tiling_info.gfx9.num_pipes = adev->gfx.config.gb_addr_config_fields.num_pipes;
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0 -1
@@ -171,7 +171,6 @@ 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 || hwmgr->chip_id ==CHIP_PICASSO ) { +if (hwmgr->chip_id ==CHIP_RAVEN ) { 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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )return 0 ;kfree (hwmgr->dyn_state.vddc_dependency_on_sclk);
include/drm/amd_asic_type.h +0 -1
@@ -49,7 +49,6 @@ 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
A message that is not in the archive (sent off-list or not yet received): 20180913204527.17965-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Huang Rui
Acked-byQuoted 4 lines · Alex Deucher
Treat them all as Raven rather than adding a new picasso asic type. This simplifies a lot of code and also handles the case of rv2 chips with the
0x15d8pci id. It also fixes dmcu fw handling for picasso.
We drop the Picasso asic type, and keep the separate ucode. It's fine. We can also support the RV2 PCO refresh with the change.
Quoted 662 lines
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- 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 | 7 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 32 ++--------- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 -- drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 11 ++-- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +--- drivers/gpu/drm/amd/amdgpu/soc15.c | 66 ++++++++++------------ 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 - 16 files changed, 60 insertions(+), 113 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-7@@ -91,7 +91,6 @@ static const char *amdgpu_asic_name[] = {"VEGA12" ,"VEGA20" ,"RAVEN" , -"PICASSO" , "LAST", };@@ -1337,12 +1336,11 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ; }snprintf (fw_name,sizeof (fw_name),"amdgpu/%s_gpu_info.bin" , chip_name);@@ -1468,8 +1466,7 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)case CHIP_VEGA12 :case CHIP_VEGA20 :case CHIP_RAVEN : -case CHIP_PICASSO : -if ((adev->asic_type ==CHIP_RAVEN ) || (adev->asic_type ==CHIP_PICASSO )) +if (adev->asic_type ==CHIP_RAVEN ) adev->family =AMDGPU_FAMILY_RV ;else adev->family =AMDGPU_FAMILY_AI ;@@ -2183,7 +2180,6 @@ 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/amdgpu/amdgpu_drv.c +1
-2@@ -874,8 +874,7 @@ 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}, + {0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, {0, 0, 0} };drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-1@@ -56,7 +56,6 @@ 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/amdgpu_ucode.c +0
-1@@ -303,7 +303,6 @@ 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)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +3
-4@@ -63,14 +63,13 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_RAVEN : -if (adev->rev_id >=8 ) +if (adev->rev_id >=8 ) fw_name =FIRMWARE_RAVEN2 ; +else if (adev->pdev->device ==0x15d8 ) + fw_name =FIRMWARE_PICASSO ;else fw_name =FIRMWARE_RAVEN ;break ; -case CHIP_PICASSO : - fw_name =FIRMWARE_PICASSO ; -break ;default :return -EINVAL ; }drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2
-2@@ -2981,7 +2981,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 || adev->asic_type ==CHIP_PICASSO ) +if (adev->asic_type ==CHIP_RAVEN ) vm->pte_support_ats = true; }else { vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &@@ -3073,7 +3073,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 || adev->asic_type ==CHIP_PICASSO ); +bool pte_support_ats = (adev->asic_type ==CHIP_RAVEN );int r; r =amdgpu_bo_reserve (vm->root.base.bo, true);drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +5
-27@@ -277,7 +277,6 @@ 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 0x24000042#define RAVEN2_GB_ADDR_CONFIG_GOLDEN 0x26013041static void gfx_v9_0_set_ring_funcs (struct amdgpu_device *adev);@@ -329,14 +328,6 @@ static void gfx_v9_0_init_golden_registers(struct amdgpu_device *adev) golden_settings_gc_9_1_rv1, ARRAY_SIZE(golden_settings_gc_9_1_rv1));break ; -case CHIP_PICASSO : -soc15_program_register_sequence (adev, - golden_settings_gc_9_1, -ARRAY_SIZE (golden_settings_gc_9_1)); -soc15_program_register_sequence (adev, - golden_settings_gc_9_1_rv1, -ARRAY_SIZE (golden_settings_gc_9_1_rv1)); -break ;default :break ; }@@ -617,12 +608,11 @@ static int gfx_v9_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }@@ -1076,7 +1066,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 || adev->asic_type ==CHIP_PICASSO ) { +if (adev->asic_type ==CHIP_RAVEN ) {/* 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,@@ -1328,14 +1318,6 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev)else 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 ;@@ -1614,7 +1596,6 @@ 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 :@@ -1776,7 +1757,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 ) || (adev->asic_type ==CHIP_PICASSO )) { +if (adev->asic_type ==CHIP_RAVEN ) {amdgpu_bo_free_kernel (&adev->gfx.rlc.cp_table_obj, &adev->gfx.rlc.cp_table_gpu_addr, (void **)&adev->gfx.rlc.cp_table_ptr);@@ -2442,7 +2423,7 @@ static int gfx_v9_0_rlc_resume(struct amdgpu_device *adev)return r; } -if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) { +if (adev->asic_type ==CHIP_RAVEN ) {if (amdgpu_lbpw !=0 )gfx_v9_0_enable_lbpw (adev, true);else @@ -3846,7 +3827,6 @@ 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);@@ -3901,7 +3881,6 @@ 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 ;@@ -4911,7 +4890,6 @@ 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 :drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +0
-4@@ -846,7 +846,6 @@ 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 ; }@@ -935,7 +934,6 @@ 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 {@@ -1062,7 +1060,6 @@ 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));@@ -1097,7 +1094,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_update_power_gating (adev, true);break ;default :drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +5
-6@@ -412,7 +412,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 && adev->asic_type !=CHIP_PICASSO ) { +if (adev->asic_type !=CHIP_RAVEN ) { def1 = data1 =RREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2); def2 = data2 =RREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2); }else @@ -428,7 +428,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN ) data2 &= ~(DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |@@ -445,7 +445,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN ) data2 |= (DAGB1_CNTL_MISC2__DISABLE_WRREQ_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_WRRET_CG_MASK | DAGB1_CNTL_MISC2__DISABLE_RDREQ_CG_MASK |@@ -458,13 +458,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 && adev->asic_type !=CHIP_PICASSO ) +if (adev->asic_type !=CHIP_RAVEN )WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2, data1);else WREG32_SOC15 (MMHUB ,0 , mmDAGB0_CNTL_MISC2_RV, data1); } -if (adev->asic_type !=CHIP_RAVEN && adev->asic_type !=CHIP_PICASSO && def2 != data2) +if (adev->asic_type !=CHIP_RAVEN && def2 != data2)WREG32_SOC15 (MMHUB ,0 , mmDAGB1_CNTL_MISC2, data2); }@@ -528,7 +528,6 @@ 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,drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +2
-3@@ -121,12 +121,11 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)case CHIP_RAVEN :if (adev->rev_id >=0x8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3
-8@@ -229,7 +229,6 @@ 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));@@ -283,12 +282,11 @@ static int sdma_v4_0_init_microcode(struct amdgpu_device *adev)case CHIP_RAVEN :if (adev->rev_id >=8 ) chip_name ="raven2" ; +else if (adev->pdev->device ==0x15d8 ) + chip_name ="picasso" ;else chip_name ="raven" ;break ; -case CHIP_PICASSO : - chip_name ="picasso" ; -break ;default :BUG (); }@@ -869,7 +867,6 @@ 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 ;@@ -1277,7 +1274,7 @@ static int sdma_v4_0_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; -if (adev->asic_type ==CHIP_RAVEN || adev->asic_type ==CHIP_PICASSO ) +if (adev->asic_type ==CHIP_RAVEN ) adev->sdma.num_instances =1 ;else adev->sdma.num_instances =2 ;@@ -1620,7 +1617,6 @@ 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,@@ -1639,7 +1635,6 @@ 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 ;drivers/gpu/drm/amd/amdgpu/soc15.c +30
-36@@ -491,7 +491,6 @@ 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 :@@ -546,7 +545,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &vce_v4_0_ip_block);break ;case CHIP_RAVEN : -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);@@ -698,6 +696,13 @@ static int soc15_common_early_init(void *handle)break ;case CHIP_RAVEN :if (adev->rev_id >=0x8 ) + adev->external_rev_id = adev->rev_id +0x81 ; +else if (adev->pdev->device ==0x15d8 ) + adev->external_rev_id = adev->rev_id +0x41 ; +else + adev->external_rev_id =0x1 ; + +if (adev->rev_id >=0x8 ) { adev->cg_flags =AMD_CG_SUPPORT_GFX_MGCG |AMD_CG_SUPPORT_GFX_MGLS | AMD_CG_SUPPORT_GFX_CP_LS |@@ -713,7 +718,27 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_MGCG |AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_VCN_MGCG ; - else + + adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; + }else if (adev->pdev->device ==0x15d8 ) { + 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 =AMD_PG_SUPPORT_SDMA | +AMD_PG_SUPPORT_MMHUB | +AMD_PG_SUPPORT_VCN ; + }else { adev->cg_flags =AMD_CG_SUPPORT_GFX_MGCG |AMD_CG_SUPPORT_GFX_MGLS | AMD_CG_SUPPORT_GFX_RLC_LS |@@ -735,43 +760,13 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_VCN_MGCG ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; - -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 ; - -if (adev->rev_id >=0x8 ) - adev->external_rev_id = adev->rev_id +0x81 ; -else - 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 =AMD_PG_SUPPORT_SDMA | -AMD_PG_SUPPORT_MMHUB | -AMD_PG_SUPPORT_VCN ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; + }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 ;default :/* FIXME: not supported yet */ @@ -973,7 +968,6 @@ 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,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-6@@ -1213,8 +1213,7 @@ 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_PICASSO ) + adev->asic_type ==CHIP_RAVEN ) client_id =SOC15_IH_CLIENTID_DCE ; int_params.requested_polarity =INTERRUPT_POLARITY_DEFAULT ;@@ -1633,7 +1632,6 @@ 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;@@ -1864,7 +1862,6 @@ 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 ;@@ -2113,8 +2110,7 @@ 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_PICASSO ) { + adev->asic_type ==CHIP_RAVEN ) {/* Fill GFX9 params */ plane_state->tiling_info.gfx9.num_pipes = adev->gfx.config.gb_addr_config_fields.num_pipes;drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +0
-1@@ -171,7 +171,6 @@ 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 || hwmgr->chip_id ==CHIP_PICASSO ) { +if (hwmgr->chip_id ==CHIP_RAVEN ) { 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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )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 || hwmgr->chip_id ==CHIP_PICASSO ) +if (hwmgr->chip_id ==CHIP_RAVEN )return 0 ;kfree (hwmgr->dyn_state.vddc_dependency_on_sclk);include/drm/amd_asic_type.h +0
-1@@ -49,7 +49,6 @@ 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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx