From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com ([209.85.221.65]:41759 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbeIYQPD (ORCPT ); Tue, 25 Sep 2018 12:15:03 -0400 Received: by mail-wr1-f65.google.com with SMTP id j15-v6so18609555wrt.8 for ; Tue, 25 Sep 2018 03:08:14 -0700 (PDT) Date: Tue, 25 Sep 2018 11:07:58 +0100 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: colin.king@canonical.com, alexander.deucher@amd.com, ray.huang@amd.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] drm/amd/pp: initialize result to before or'ing in data" failed to apply to 4.14-stable tree Message-ID: <20180925100758.xkibb5z3fo6d3xry@debian> References: <1530805720136227@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="coumasgbex5cwhtg" Content-Disposition: inline In-Reply-To: <1530805720136227@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --coumasgbex5cwhtg Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Greg, On Thu, Jul 05, 2018 at 05:48:40PM +0200, gregkh@linuxfoundation.org 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 . The attached backported patch should now apply to 4.14-stable tree. -- Regards Sudip --coumasgbex5cwhtg Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-drm-amd-pp-initialize-result-to-before-or-ing-in-dat.patch" >>From 1e74d665a66f8c796728e8b76f022d037d803f83 Mon Sep 17 00:00:00 2001 From: Colin Ian King 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" Fixes: 9b7b8154cdb8 ("drm/amd/powerplay: added didt support for vega10") Signed-off-by: Colin Ian King Acked-by: Huang Rui [Fix the subject as Colin's comment] Signed-off-by: Huang Rui Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Sudip Mukherjee --- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c index e7fa67063cdc..cb9e1cd456b8 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c @@ -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); -- 2.11.0 --coumasgbex5cwhtg--