From ff79652aee09819fe497bd6e08c4a4effb521c03 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 24 Feb 2022 13:09:00 +0000 Subject: [PATCH] display/amd: decrease message verbosity about watermarks table failure From Mario Limonciello 3fd92f5be6c48cce92c90ecf71719582645da888 in linux 5.15.y/5.15.25 03ad3093c7c069d6ab4403730009ebafeea9ee37 in mainline linux --- sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c b/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c index 2bfa13e3abe..0aa0c95b03e 100644 --- a/sys/dev/pci/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c +++ b/sys/dev/pci/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.20.1