Commit a0fcd3df authored by Dillon Varone's avatar Dillon Varone Committed by Alex Deucher
Browse files

drm/amd/display: Add DML2.1 option to disable DRR clamped P-State Strategies 



[WHY & HOW]
When DRR is active with variable refresh rate, add the ability to block DRR
clamped P-State strategies (such as SubVP).

Reviewed-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Signed-off-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e80f8f49

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

+1 −0
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ enum in_game_fams_config { 
	INGAME_FAMS_SINGLE_DISP_ENABLE, // enable in-game fams

	INGAME_FAMS_DISABLE, // disable in-game fams

	INGAME_FAMS_MULTI_DISP_ENABLE, //enable in-game fams for multi-display

	INGAME_FAMS_MULTI_DISP_CLAMPED_ONLY, //enable in-game fams for multi-display only for clamped RR strategies

};



/**

drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c

+3 −1
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ static void dml21_apply_debug_options(const struct dc *in_dc, struct dml2_contex 
			disable_fams2;

	pmo_options->disable_fams2 = disable_fams2;



	pmo_options->disable_drr_var_when_var_active = in_dc->debug.disable_fams_gaming;

	pmo_options->disable_drr_var_when_var_active = in_dc->debug.disable_fams_gaming == INGAME_FAMS_DISABLE ||

			in_dc->debug.disable_fams_gaming == INGAME_FAMS_MULTI_DISP_CLAMPED_ONLY;

	pmo_options->disable_drr_clamped_when_var_active = in_dc->debug.disable_fams_gaming == INGAME_FAMS_DISABLE;

}



static void dml21_init(const struct dc *in_dc, struct dml2_context **dml_ctx, const struct dml2_configuration_options *config)

drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct dml2_pmo_options { 
	bool disable_drr_var;

	bool disable_drr_clamped;

	bool disable_drr_var_when_var_active;

	bool disable_drr_clamped_when_var_active;

	bool disable_fams2;

	bool disable_vactive_det_fill_bw_pad; /* dml2_project_dcn4x_stage2_auto_drr_svp and above only */

	bool disable_dyn_odm;

drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c

+5 −2
Original line number Diff line number Diff line
@@ -1441,8 +1441,11 @@ static bool stream_matches_drr_policy(struct dml2_pmo_instance *pmo, 
		strategy_matches_drr_requirements = false;

	} else if (is_bit_set_in_bitfield(PMO_DRR_CLAMPED_STRATEGY_MASK, stream_pstate_method) &&

			(pmo->options->disable_drr_clamped ||

			!stream_descriptor->timing.drr_config.enabled ||

			(!stream_descriptor->timing.drr_config.drr_active_fixed && !stream_descriptor->timing.drr_config.drr_active_variable))) {

			(!stream_descriptor->timing.drr_config.enabled ||

			(!stream_descriptor->timing.drr_config.drr_active_fixed && !stream_descriptor->timing.drr_config.drr_active_variable)) ||

			(pmo->options->disable_drr_clamped_when_var_active &&

			stream_descriptor->timing.drr_config.enabled &&

			stream_descriptor->timing.drr_config.drr_active_variable))) {

		/* DRR fixed strategies are disallowed due to settings or policy */

		strategy_matches_drr_requirements = false;

	} else if (is_bit_set_in_bitfield(PMO_FW_STRATEGY_MASK, stream_pstate_method) &&