| From a7bb8b2c501349b65a948cf156f4c70afc1c0349 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 25 Jan 2022 15:49:47 -0600 |
| Subject: display/amd: decrease message verbosity about watermarks table |
| failure |
| |
| From: Mario Limonciello <mario.limonciello@amd.com> |
| |
| [ Upstream commit 03ad3093c7c069d6ab4403730009ebafeea9ee37 ] |
| |
| A number of BIOS versions have a problem with the watermarks table not |
| being configured properly. This manifests as a very scary looking warning |
| during resume from s0i3. This should be harmless in most cases and is well |
| understood, so decrease the assertion to a clearer warning about the problem. |
| |
| Reviewed-by: Harry Wentland <harry.wentland@amd.com> |
| Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c |
| index 162ae71861247..21d2cbc3cbb20 100644 |
| --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c |
| +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c |
| @@ -120,7 +120,11 @@ int dcn31_smu_send_msg_with_param( |
| result = dcn31_smu_wait_for_response(clk_mgr, 10, 200000); |
| |
| if (result == VBIOSSMC_Result_Failed) { |
| - ASSERT(0); |
| + if (msg_id == VBIOSSMC_MSG_TransferTableDram2Smu && |
| + param == TABLE_WATERMARKS) |
| + DC_LOG_WARNING("Watermarks table not configured properly by SMU"); |
| + else |
| + ASSERT(0); |
| REG_WRITE(MP1_SMN_C2PMSG_91, VBIOSSMC_Result_OK); |
| return -1; |
| } |
| -- |
| 2.34.1 |
| |
