[PATCH] display/amd: decrease message verbosity about watermarks table failure

[Harry Wentland]

On 2022-01-25 18:35, Mario Limonciello wrote:
> 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.
> 
> Signed-off-by: Mario Limonciello <mario.limonciello at amd.com>

Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Harry

> ---
>  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 162ae7186124..21d2cbc3cbb2 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;
>  	}