backports of upstream fixes for stable
Subsystems (3)
cover backports of upstream fixes for stable
These commits failed to apply cleanly to stable so I have cherry-picked them from Linus' tree and fixed up the conflicts. The original uptream commit is referenced in the commit message as I used cherry-pick -x.
Please apply!
Thanks,
Alex
Alex Deucher (1):
drm/amdgpu/swsmu: drop smu i2c bus on navi1x
Andrey Grodzovsky (1):
drm/amd/psp: Fix sysfs: cannot create duplicate filename
Evan Quan (1):
drm/amd/pm: increase mclk switch threshold to 200 us
Kenneth Feng (1):
drm/amd/pm: fix pp_dpm_fclk
Kevin Wang (1):
drm/amd/swsmu: add missing feature map for sienna_cichlid
Likun Gao (2):
drm/amdgpu: add function to program pbb mode for sienna cichlid drm/amdgpu: correct the cu and rb info for sienna cichlid
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 71 +++++++++++++++++++ .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ------- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 6 ++ 6 files changed, 81 insertions(+), 28 deletions(-)
Signature · 1 line
2.25.4
PATCH 1/7 drm/amdgpu/swsmu: drop smu i2c bus on navi1x
Stop registering the SMU i2c bus on navi1x. This leads to instability issues when userspace processes mess with the bus and also seems to cause display stability issues in some cases.
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ---------------------- 1 file changed, 26 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -26
@@ -2463,37 +2463,11 @@ static const struct i2c_algorithm navi10_i2c_algo = { .functionality = navi10_i2c_func, }; -static int navi10_i2c_control_init (struct smu_context *smu,struct i2c_adapter *control) -{ -struct amdgpu_device *adev =to_amdgpu_device (control); -int res; - - control->owner =THIS_MODULE ; - control->class =I2C_CLASS_SPD ; - control->dev.parent = &adev->pdev->dev; - control->algo = &navi10_i2c_algo; -snprintf (control->name,sizeof (control->name),"AMDGPU SMU" ); - - res =i2c_add_adapter (control); -if (res) -DRM_ERROR ("Failed to register hw i2c, err: %d\n" , res); - -return res; -} - -static void navi10_i2c_control_fini (struct smu_context *smu,struct i2c_adapter *control) -{ -i2c_del_adapter (control); -} - -static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table, .dpm_set_vcn_enable = navi10_dpm_set_vcn_enable, .dpm_set_jpeg_enable = navi10_dpm_set_jpeg_enable, - .i2c_init = navi10_i2c_control_init, - .i2c_fini = navi10_i2c_control_fini, .print_clk_levels = navi10_print_clk_levels, .force_clk_levels = navi10_force_clk_levels, .populate_umd_state_clk = navi10_populate_umd_state_clk,
Signature · 1 line
2.25.4
PATCH 1/7 drm/amdgpu/swsmu: drop smu i2c bus on navi1x
In reply to Alex DeucherStop registering the SMU i2c bus on navi1x. This leads to instability issues when userspace processes mess with the bus and also seems to cause display stability issues in some cases.
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ---------------------- 1 file changed, 26 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -26
@@ -2463,37 +2463,11 @@ static const struct i2c_algorithm navi10_i2c_algo = { .functionality = navi10_i2c_func, }; -static int navi10_i2c_control_init (struct smu_context *smu,struct i2c_adapter *control) -{ -struct amdgpu_device *adev =to_amdgpu_device (control); -int res; - - control->owner =THIS_MODULE ; - control->class =I2C_CLASS_SPD ; - control->dev.parent = &adev->pdev->dev; - control->algo = &navi10_i2c_algo; -snprintf (control->name,sizeof (control->name),"AMDGPU SMU" ); - - res =i2c_add_adapter (control); -if (res) -DRM_ERROR ("Failed to register hw i2c, err: %d\n" , res); - -return res; -} - -static void navi10_i2c_control_fini (struct smu_context *smu,struct i2c_adapter *control) -{ -i2c_del_adapter (control); -} - -static const struct pptable_funcs navi10_ppt_funcs = { .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table, .dpm_set_vcn_enable = navi10_dpm_set_vcn_enable, .dpm_set_jpeg_enable = navi10_dpm_set_jpeg_enable, - .i2c_init = navi10_i2c_control_init, - .i2c_fini = navi10_i2c_control_fini, .print_clk_levels = navi10_print_clk_levels, .force_clk_levels = navi10_force_clk_levels, .populate_umd_state_clk = navi10_populate_umd_state_clk,
Signature · 1 line
2.25.4
PATCH 2/7 drm/amd/pm: increase mclk switch threshold to 200 us
In reply to Alex DeucherFrom: Evan Quan <[email protected]>
To avoid underflow seen on Polaris10 with some 3440x1440 144Hz displays. As the threshold of 190 us cuts too close to minVBlankTime of 192 us.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -1
@@ -2873,7 +2873,7 @@ static int smu7_vblank_too_short(struct pp_hwmgr *hwmgr,if (hwmgr->is_kicker) switch_limit_us = data->is_memory_gddr5 ?450 :150 ;else - switch_limit_us = data->is_memory_gddr5 ?190 :150 ; + switch_limit_us = data->is_memory_gddr5 ?200 :150 ;break ;case CHIP_VEGAM : switch_limit_us =30 ;
Signature · 1 line
2.25.4
PATCH 3/7 drm/amd/pm: fix pp_dpm_fclk
In reply to Alex DeucherFrom: Kenneth Feng <[email protected]>
fclk value is missing in pp_dpm_fclk. add this to correctly show the current value.
--- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +3 -0
@@ -447,6 +447,9 @@ static int sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,case METRICS_CURR_DCEFCLK : *value = metrics->CurrClock[PPCLK_DCEFCLK ];break ; +case METRICS_CURR_FCLK : + *value = metrics->CurrClock[PPCLK_FCLK ]; +break ;case METRICS_AVERAGE_GFXCLK :if (metrics->AverageGfxActivity <=SMU_11_0_7_GFX_BUSY_THRESHOLD ) *value = metrics->AverageGfxclkFrequencyPostDs;
Signature · 1 line
2.25.4
PATCH 4/7 drm/amd/swsmu: add missing feature map for sienna_cichlid
In reply to Alex DeucherFrom: Kevin Wang <[email protected]>
it will cause smu sysfs node of "pp_features" show error.
--- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 3 +++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
@@ -217,6 +217,7 @@ enum smu_clk_type {__SMU_DUMMY_MAP (DPM_MP0CLK ), \__SMU_DUMMY_MAP (DPM_LINK ), \__SMU_DUMMY_MAP (DPM_DCEFCLK ), \ +__SMU_DUMMY_MAP (DPM_XGMI ), \__SMU_DUMMY_MAP (DS_GFXCLK ), \__SMU_DUMMY_MAP (DS_SOCCLK ), \ __SMU_DUMMY_MAP(DS_LCLK), \
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +3 -0
@@ -150,14 +150,17 @@ static struct cmn2asic_mapping sienna_cichlid_feature_mask_map[SMU_FEATURE_COUNTFEA_MAP (DPM_GFXCLK ),FEA_MAP (DPM_GFX_GPO ),FEA_MAP (DPM_UCLK ), +FEA_MAP (DPM_FCLK ),FEA_MAP (DPM_SOCCLK ),FEA_MAP (DPM_MP0CLK ),FEA_MAP (DPM_LINK ),FEA_MAP (DPM_DCEFCLK ), +FEA_MAP (DPM_XGMI ),FEA_MAP (MEM_VDDCI_SCALING ),FEA_MAP (MEM_MVDD_SCALING ),FEA_MAP (DS_GFXCLK ),FEA_MAP (DS_SOCCLK ), +FEA_MAP (DS_FCLK ),FEA_MAP (DS_LCLK ),FEA_MAP (DS_DCEFCLK ), FEA_MAP(DS_UCLK),
Signature · 1 line
2.25.4
PATCH 5/7 drm/amdgpu: add function to program pbb mode for sienna cichlid
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Add function for sienna_cichlid to force PBB workload mode to zero by checking whether there have SE been harvested.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +62 -0
@@ -112,6 +112,22 @@#define mmCP_HYP_ME_UCODE_DATA 0x5817#define mmCP_HYP_ME_UCODE_DATA_BASE_IDX 1 +//CC_GC_SA_UNIT_DISABLE +#define mmCC_GC_SA_UNIT_DISABLE 0x0fe9 +#define mmCC_GC_SA_UNIT_DISABLE_BASE_IDX 0 +#define CC_GC_SA_UNIT_DISABLE__SA_DISABLE__SHIFT 0x8 +#define CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK 0x0000FF00L +//GC_USER_SA_UNIT_DISABLE +#define mmGC_USER_SA_UNIT_DISABLE 0x0fea +#define mmGC_USER_SA_UNIT_DISABLE_BASE_IDX 0 +#define GC_USER_SA_UNIT_DISABLE__SA_DISABLE__SHIFT 0x8 +#define GC_USER_SA_UNIT_DISABLE__SA_DISABLE_MASK 0x0000FF00L +//PA_SC_ENHANCE_3 +#define mmPA_SC_ENHANCE_3 0x1085 +#define mmPA_SC_ENHANCE_3_BASE_IDX 0 +#define PA_SC_ENHANCE_3__FORCE_PBB_WORKLOAD_MODE_TO_ZERO__SHIFT 0x3 +#define PA_SC_ENHANCE_3__FORCE_PBB_WORKLOAD_MODE_TO_ZERO_MASK 0x00000008L +MODULE_FIRMWARE ("amdgpu/navi10_ce.bin" );MODULE_FIRMWARE ("amdgpu/navi10_pfp.bin" );MODULE_FIRMWARE ("amdgpu/navi10_me.bin" );
@@ -3188,6 +3204,8 @@ static int gfx_v10_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev);static void gfx_v10_0_ring_emit_ce_meta (struct amdgpu_ring *ring,bool resume);static void gfx_v10_0_ring_emit_de_meta (struct amdgpu_ring *ring,bool resume);static void gfx_v10_0_ring_emit_frame_cntl (struct amdgpu_ring *ring,bool start,bool secure); +static u32 gfx_v10_3_get_disabled_sa (struct amdgpu_device *adev); +static void gfx_v10_3_program_pbb_mode (struct amdgpu_device *adev);static void gfx10_kiq_set_resources (struct amdgpu_ring *kiq_ring,uint64_t queue_mask) {
@@ -6928,6 +6946,9 @@ static int gfx_v10_0_hw_init(void *handle)if (r)return r; +if (adev->asic_type ==CHIP_SIENNA_CICHLID ) +gfx_v10_3_program_pbb_mode (adev); +return r; }
@@ -8773,6 +8794,47 @@ static int gfx_v10_0_get_cu_info(struct amdgpu_device *adev,return 0 ; } +static u32 gfx_v10_3_get_disabled_sa (struct amdgpu_device *adev) +{ +uint32_t efuse_setting, vbios_setting, disabled_sa, max_sa_mask; + + efuse_setting =RREG32_SOC15 (GC ,0 , mmCC_GC_SA_UNIT_DISABLE); + efuse_setting &=CC_GC_SA_UNIT_DISABLE__SA_DISABLE_MASK ; + efuse_setting >>=CC_GC_SA_UNIT_DISABLE__SA_DISABLE__SHIFT ; + + vbios_setting =RREG32_SOC15 (GC ,0 , mmGC_USER_SA_UNIT_DISABLE); + vbios_setting &=GC_USER_SA_UNIT_DISABLE__SA_DISABLE_MASK ; + vbios_setting >>=GC_USER_SA_UNIT_DISABLE__SA_DISABLE__SHIFT ; + + max_sa_mask =amdgpu_gfx_create_bitmask (adev->gfx.config.max_sh_per_se * + adev->gfx.config.max_shader_engines); + disabled_sa = efuse_setting | vbios_setting; + disabled_sa &= max_sa_mask; + +return disabled_sa; +} + +static void gfx_v10_3_program_pbb_mode (struct amdgpu_device *adev) +{ +uint32_t max_sa_per_se, max_sa_per_se_mask, max_shader_engines; +uint32_t disabled_sa_mask, se_index, disabled_sa_per_se; + + disabled_sa_mask =gfx_v10_3_get_disabled_sa (adev); + + max_sa_per_se = adev->gfx.config.max_sh_per_se; + max_sa_per_se_mask = (1 << max_sa_per_se) -1 ; + max_shader_engines = adev->gfx.config.max_shader_engines; + +for (se_index =0 ; max_shader_engines > se_index; se_index++) { + disabled_sa_per_se = disabled_sa_mask >> (se_index * max_sa_per_se); + disabled_sa_per_se &= max_sa_per_se_mask; +if (disabled_sa_per_se == max_sa_per_se_mask) { +WREG32_FIELD15 (GC ,0 ,PA_SC_ENHANCE_3 ,FORCE_PBB_WORKLOAD_MODE_TO_ZERO ,1 ); +break ; + } + } +} +const struct amdgpu_ip_block_version gfx_v10_0_ip_block = { .type =AMD_IP_BLOCK_TYPE_GFX ,
Signature · 1 line
2.25.4
PATCH 6/7 drm/amdgpu: correct the cu and rb info for sienna cichlid
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Skip disabled sa to correct the cu_info and active_rbs for sienna cichlid.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +9 -0
@@ -4536,12 +4536,17 @@ static void gfx_v10_0_setup_rb(struct amdgpu_device *adev)int i, j;u32 data;u32 active_rbs =0 ; +u32 bitmap;u32 rb_bitmap_width_per_sh = adev->gfx.config.max_backends_per_se / adev->gfx.config.max_sh_per_se;mutex_lock (&adev->grbm_idx_mutex);for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {for (j =0 ; j < adev->gfx.config.max_sh_per_se; j++) { + bitmap = i * adev->gfx.config.max_sh_per_se + j; +if ((adev->asic_type ==CHIP_SIENNA_CICHLID ) && + ((gfx_v10_3_get_disabled_sa (adev) >> bitmap) &1 )) +continue ;gfx_v10_0_select_se_sh (adev, i, j,0xffffffff ); data =gfx_v10_0_get_rb_active_bitmap (adev); active_rbs |= data << ((i * adev->gfx.config.max_sh_per_se + j) *
@@ -8760,6 +8765,10 @@ static int gfx_v10_0_get_cu_info(struct amdgpu_device *adev,mutex_lock (&adev->grbm_idx_mutex);for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {for (j =0 ; j < adev->gfx.config.max_sh_per_se; j++) { + bitmap = i * adev->gfx.config.max_sh_per_se + j; +if ((adev->asic_type ==CHIP_SIENNA_CICHLID ) && + ((gfx_v10_3_get_disabled_sa (adev) >> bitmap) &1 )) +continue ; mask =1 ; ao_bitmap =0 ; counter =0 ;
Signature · 1 line
2.25.4
PATCH 7/7 drm/amd/psp: Fix sysfs: cannot create duplicate filename
In reply to Alex DeucherFrom: Andrey Grodzovsky <[email protected]>
psp sysfs not cleaned up on driver unload for sienna_cichlid
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -1
@@ -206,7 +206,8 @@ static int psp_sw_fini(void *handle) adev->psp.ta_fw =NULL ; } -if (adev->asic_type ==CHIP_NAVI10 ) +if (adev->asic_type ==CHIP_NAVI10 || + adev->asic_type ==CHIP_SIENNA_CICHLID )psp_sysfs_fini (adev);return 0 ;
Signature · 1 line
2.25.4
Greg KH
maintainerQuoted 4 lines · Alex Deucher
These commits failed to apply cleanly to stable so I have cherry-picked them from Linus' tree and fixed up the conflicts. The original uptream commit is referenced in the commit message as I used cherry-pick -x.
What stable tree(s) should these go to?
thanks,
greg k-h
Quoted 8 lines · Greg KH
Quoted 4 lines · Alex Deucher
These commits failed to apply cleanly to stable so I have cherry-picked them from Linus' tree and fixed up the conflicts. The original uptream commit is referenced in the commit message as I used cherry-pick -x.
What stable tree(s) should these go to?
5.9.x
Thanks,
Alex
Quoted 4 lines
thanks,
greg k-h