Commit 149f6d1a authored by Saaem Rizvi's avatar Saaem Rizvi Committed by Alex Deucher
Browse files

drm/amd/display: Removing assert statements for Linux 

[WHY]
Assert statements causing several bugs on Linux DM

[HOW]
Removing assert statement for Linux DM
(ASSERT(result == VBIOSSMC_Result_OK)). Also adding
logging statements for setting dcfclk.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=216092


Fixes: c1b972a1 ("drm/amd/display: Insert pulling smu busy status before sending another request")
Reviewed-by: default avatarGabe Teeger <Gabe.Teeger@amd.com>
Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarSaaem Rizvi <SyedSaaem.Rizvi@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 90bb21cb

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr_vbios_smu.c

+6 −2
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ static int rn_vbios_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, 
	uint32_t result;



	result = rn_smu_wait_for_response(clk_mgr, 10, 200000);

	ASSERT(result == VBIOSSMC_Result_OK);



	smu_print("SMU response after wait: %d\n", result);

	if (result != VBIOSSMC_Result_OK)

		smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result);



	if (result == VBIOSSMC_Status_BUSY) {

		return -1;
@@ -188,6 +188,10 @@ int rn_vbios_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int reque 
			VBIOSSMC_MSG_SetHardMinDcfclkByFreq,

			khz_to_mhz_ceil(requested_dcfclk_khz));



#ifdef DBG

	smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000);

#endif



	return actual_dcfclk_set_mhz * 1000;

}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/dcn301_smu.c

+6 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ static int dcn301_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, 


	result = dcn301_smu_wait_for_response(clk_mgr, 10, 200000);



	smu_print("SMU response after wait: %d\n", result);

	if (result != VBIOSSMC_Result_OK)

		smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result);



	if (result == VBIOSSMC_Status_BUSY) {

		return -1;
@@ -179,6 +180,10 @@ int dcn301_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request 
			VBIOSSMC_MSG_SetHardMinDcfclkByFreq,

			khz_to_mhz_ceil(requested_dcfclk_khz));



#ifdef DBG

	smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000);

#endif



	return actual_dcfclk_set_mhz * 1000;

}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c

+6 −2
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ static int dcn31_smu_send_msg_with_param(struct clk_mgr_internal *clk_mgr, 
	uint32_t result;



	result = dcn31_smu_wait_for_response(clk_mgr, 10, 200000);

	ASSERT(result == VBIOSSMC_Result_OK);



	smu_print("SMU response after wait: %d\n", result);

	if (result != VBIOSSMC_Result_OK)

		smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result);



	if (result == VBIOSSMC_Status_BUSY) {

		return -1;
@@ -202,6 +202,10 @@ int dcn31_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int requeste 
			VBIOSSMC_MSG_SetHardMinDcfclkByFreq,

			khz_to_mhz_ceil(requested_dcfclk_khz));



#ifdef DBG

	smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000);

#endif



	return actual_dcfclk_set_mhz * 1000;

}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c

+6 −2
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ static int dcn315_smu_send_msg_with_param( 
	uint32_t result;



	result = dcn315_smu_wait_for_response(clk_mgr, 10, 200000);

	ASSERT(result == VBIOSSMC_Result_OK);



	smu_print("SMU response after wait: %d\n", result);

	if (result != VBIOSSMC_Result_OK)

		smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result);



	if (result == VBIOSSMC_Status_BUSY) {

		return -1;
@@ -205,6 +205,10 @@ int dcn315_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request 
			VBIOSSMC_MSG_SetHardMinDcfclkByFreq,

			khz_to_mhz_ceil(requested_dcfclk_khz));



#ifdef DBG

	smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000);

#endif



	return actual_dcfclk_set_mhz * 1000;

}

drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c

+6 −2
Original line number Diff line number Diff line
@@ -124,9 +124,9 @@ static int dcn316_smu_send_msg_with_param( 
	uint32_t result;



	result = dcn316_smu_wait_for_response(clk_mgr, 10, 200000);

	ASSERT(result == VBIOSSMC_Result_OK);



	smu_print("SMU response after wait: %d\n", result);

	if (result != VBIOSSMC_Result_OK)

		smu_print("SMU Response was not OK. SMU response after wait received is: %d\n", result);



	if (result == VBIOSSMC_Status_BUSY) {

		return -1;
@@ -191,6 +191,10 @@ int dcn316_smu_set_hard_min_dcfclk(struct clk_mgr_internal *clk_mgr, int request 
			VBIOSSMC_MSG_SetHardMinDcfclkByFreq,

			khz_to_mhz_ceil(requested_dcfclk_khz));



#ifdef DBG

	smu_print("actual_dcfclk_set_mhz %d is set to : %d\n", actual_dcfclk_set_mhz, actual_dcfclk_set_mhz * 1000);

#endif



	return actual_dcfclk_set_mhz * 1000;

}