diff options
| author |  Mario Limonciello <mario.limonciello@amd.com>
| 2022-01-25 15:49:47 -0600 |
|---|---|---|
| committer |  Alex Deucher <alexander.deucher@amd.com>
| 2022-01-27 15:48:50 -0500 |
| commit | 9a17696049889550ce76a987562e679535943c96 (patch) | |
| tree | 29839a11ba2910a5048fd7bf01e9f3c5f59ca495 /drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31 | |
| parent | drm/amdgpu: Wipe all VRAM on free when RAS is enabled (diff) | |
| download | linux-9a17696049889550ce76a987562e679535943c96.tar.gz linux-9a17696049889550ce76a987562e679535943c96.tar.bz2 linux-9a17696049889550ce76a987562e679535943c96.zip | |
display/amd: decrease message verbosity about watermarks table failure
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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 9b4836350547..c5d7d075026f 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 @@ static int dcn31_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, 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; } |