From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E092194AC7; Thu, 5 Sep 2024 09:46:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725529600; cv=none; b=L0TDrp4S9M4T1A2WcckKDTlP0mL1TMPXvbom4GLrL7iw/YCF8GEdkKK/v14pXpYrYMlT1D89Jzexoty0FLuzfe68GeQuZDvTM/CCxxicH6IjuZn4xaPULfbDHNW8f5NYrtbBwfL2aX30AjplSvfetDOPjVpIeAm2frPVj5R9z0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725529600; c=relaxed/simple; bh=pDSE+IoJC8yW1S8xj+BvhJUYXSTV77xZIRCHJiWcUmY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uEr1loBO1DANptQu3bJg465AGKgMPQEc51KE9P5V+k+NK6+sb+R4s+EXcB+Yhlnl42HDXTS3n6hMG7xjZ3ThgnOpHx+zeKfGgz0cP/eA+0PRbsZChLFiAhshppNEiAGwz1HZHQvkKH6vTgf+bqeURbsZ5J+2Zgg/Cux13wzfaAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1QQ9neCW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1QQ9neCW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 689D7C4CEC7; Thu, 5 Sep 2024 09:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725529599; bh=pDSE+IoJC8yW1S8xj+BvhJUYXSTV77xZIRCHJiWcUmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1QQ9neCWKZBUqom9da9hoLqV37YnAtFtxgV5inFy400sAhuvM2oZp5L1Zj/ZHRXLP jRzB4a7nZ57DyMhTL8BIl1KMO1F/zpwQLZ64PXDk7GcR9PIZWP2j8CenDpMEJRUrlF 8gEMu1Ia4N2jjjkjkv17Oc4Q21jKqlEyFsOPJh9c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ma Jun , Alex Deucher , Yang Wang , Sasha Levin Subject: [PATCH 6.10 084/184] drm/amdgpu/pm: Fix uninitialized variable agc_btc_response Date: Thu, 5 Sep 2024 11:39:57 +0200 Message-ID: <20240905093735.521899704@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240905093732.239411633@linuxfoundation.org> References: <20240905093732.239411633@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ma Jun [ Upstream commit df4409d8a04dd39d7f2aa0c5f528a56b99eaaa13 ] Assign an default value to agc_btc_response in failed case Signed-off-by: Ma Jun Acked-by: Alex Deucher Reviewed-by: Yang Wang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c index 246b6568eb0d..ff605063d7ef 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c @@ -2361,15 +2361,20 @@ static int vega10_acg_enable(struct pp_hwmgr *hwmgr) { struct vega10_hwmgr *data = hwmgr->backend; uint32_t agc_btc_response; + int ret; if (data->smu_features[GNLD_ACG].supported) { if (0 == vega10_enable_smc_features(hwmgr, true, data->smu_features[GNLD_DPM_PREFETCHER].smu_feature_bitmap)) data->smu_features[GNLD_DPM_PREFETCHER].enabled = true; - smum_send_msg_to_smc(hwmgr, PPSMC_MSG_InitializeAcg, NULL); + ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_InitializeAcg, NULL); + if (ret) + return ret; - smum_send_msg_to_smc(hwmgr, PPSMC_MSG_RunAcgBtc, &agc_btc_response); + ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_RunAcgBtc, &agc_btc_response); + if (ret) + agc_btc_response = 0; if (1 == agc_btc_response) { if (1 == data->acg_loop_state) -- 2.43.0