FAILED: patch "[PATCH] drm/amd/pp: initialize result to before or'ing in data" failed to apply to 4.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
c4ff91dd40e2253ab6dd028011469c2c694e1e19Mon Sep 17 00:00:00 2001
From: Colin Ian King <[email protected]>
Date: Wed, 6 Jun 2018 13:18:31 +0100
Subject: [PATCH] drm/amd/pp: initialize result to before or'ing in data
The current use of result is or'ing in values and checking for a non-zero result, however, result is not initialized to zero so it potentially contains garbage to start with. Fix this by initializing it to the first return from the call to vega10_program_didt_config_registers.
Detected by cppcheck:
"(error) Uninitialized variable: result"
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +1 -1
@@ -1104,7 +1104,7 @@ static int vega10_enable_psm_gc_edc_config(struct pp_hwmgr *hwmgr)for (count =0 ; count < num_se; count++) { data =GRBM_GFX_INDEX__INSTANCE_BROADCAST_WRITES_MASK |GRBM_GFX_INDEX__SH_BROADCAST_WRITES_MASK | ( count <<GRBM_GFX_INDEX__SE_INDEX__SHIFT );WREG32_SOC15 (GC ,0 , mmGRBM_GFX_INDEX, data); - result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallPatternConfig_Vega10,VEGA10_CONFIGREG_DIDT ); + result =vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallPatternConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallDelayConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCCtrlResetConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCCtrlConfig_Vega10,VEGA10_CONFIGREG_DIDT );
Sudip Mukherjee
Acked-by Huang RuiHi Greg,
Quoted 5 lines · On Thu, Jul 05, 2018 at 05:48:40PM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
The attached backported patch should now apply to 4.14-stable tree.
--
Regards
Sudip
Quoted 1 line
From
1e74d665a66f8c796728e8b76f022d037d803f83Mon Sep 17 00:00:00 2001
From: Colin Ian King <[email protected]>
Date: Wed, 6 Jun 2018 13:18:31 +0100
Subject: [PATCH] drm/amd/pp: initialize result to before or'ing in data
commit c4ff91dd40e2253ab6dd028011469c2c694e1e19 upstream
The current use of result is or'ing in values and checking for a non-zero result, however, result is not initialized to zero so it potentially contains garbage to start with. Fix this by initializing it to the first return from the call to vega10_program_didt_config_registers.
Detected by cppcheck:
"(error) Uninitialized variable: result"
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +1 -1
@@ -1142,7 +1142,7 @@ static int vega10_enable_psm_gc_edc_config(struct pp_hwmgr *hwmgr)for (count =0 ; count < num_se; count++) { data =GRBM_GFX_INDEX__INSTANCE_BROADCAST_WRITES_MASK |GRBM_GFX_INDEX__SH_BROADCAST_WRITES_MASK | ( count <<GRBM_GFX_INDEX__SE_INDEX__SHIFT );cgs_write_register (hwmgr->device, reg, data); - result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallPatternConfig_Vega10,VEGA10_CONFIGREG_DIDT ); + result =vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallPatternConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCStallDelayConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCCtrlResetConfig_Vega10,VEGA10_CONFIGREG_DIDT ); result |=vega10_program_didt_config_registers (hwmgr, PSMSEEDCCtrlConfig_Vega10,VEGA10_CONFIGREG_DIDT );
Signature · 1 line
2.11.0
Greg KH
maintainerQuoted 10 lines · Sudip Mukherjee
Hi Greg,
Quoted 5 lines · On Thu, Jul 05, 2018 at 05:48:40PM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.The attached backported patch should now apply to 4.14-stable tree.
Now applied, thanks.
greg k-h