Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 263318ee authored by Hersen Wu's avatar Hersen Wu Committed by Alex Deucher
Browse files

drm/amd/display: Fix DP HBR2 Eye Diagram Pattern on Carrizo 



[why] dp hbr2 eye diagram pattern for raven asic is not stabled.
workaround is to use tp4 pattern. But this should not be
applied to asic before raven.

[how] add new bool varilable in asic caps. for raven asic,
use the workaround. for carrizo, vega, do not use workaround.

Signed-off-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 96a5d8d4

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

+3 −5
Original line number Diff line number Diff line
@@ -1767,12 +1767,10 @@ static void dp_test_send_link_training(struct dc_link *link) 
	dp_retrain_link_dp_test(link, &link_settings, false);

}



/* TODO hbr2 compliance eye output is unstable

/* TODO Raven hbr2 compliance eye output is unstable

 * (toggling on and off) with debugger break

 * This caueses intermittent PHY automation failure

 * Need to look into the root cause */

static uint8_t force_tps4_for_cp2520 = 1;



static void dp_test_send_phy_test_pattern(struct dc_link *link)

{

	union phy_test_pattern dpcd_test_pattern;
@@ -1832,13 +1830,13 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link) 
		break;

	case PHY_TEST_PATTERN_CP2520_1:

		/* CP2520 pattern is unstable, temporarily use TPS4 instead */

		test_pattern = (force_tps4_for_cp2520 == 1) ?

		test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?

				DP_TEST_PATTERN_TRAINING_PATTERN4 :

				DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;

		break;

	case PHY_TEST_PATTERN_CP2520_2:

		/* CP2520 pattern is unstable, temporarily use TPS4 instead */

		test_pattern = (force_tps4_for_cp2520 == 1) ?

		test_pattern = (link->dc->caps.force_dp_tps4_for_cp2520 == 1) ?

				DP_TEST_PATTERN_TRAINING_PATTERN4 :

				DP_TEST_PATTERN_HBR2_COMPLIANCE_EYE;

		break;

drivers/gpu/drm/amd/display/dc/dc.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct dc_caps { 
	bool is_apu;

	bool dual_link_dvi;

	bool post_blend_color_processing;

	bool force_dp_tps4_for_cp2520;

};



struct dc_dcc_surface_param {

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

+2 −0
Original line number Diff line number Diff line
@@ -1027,6 +1027,8 @@ static bool construct( 
	dc->caps.max_slave_planes = 1;

	dc->caps.is_apu = true;

	dc->caps.post_blend_color_processing = false;

	/* Raven DP PHY HBR2 eye diagram pattern is not stable. Use TP4 */

	dc->caps.force_dp_tps4_for_cp2520 = true;



	if (dc->ctx->dce_environment == DCE_ENV_PRODUCTION_DRV)

		dc->debug = debug_defaults_drv;