Commit 88fdd89d authored by Karthi Kandasamy's avatar Karthi Kandasamy Committed by Alex Deucher
Browse files

drm/amd/display: Add control flags to force PSR / replay 



To change PSR/Replay behavior based on OS preferences, add some
config options.

Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarKarthi Kandasamy <karthi.kandasamy@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1c65502f

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

+4 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ struct psr_config { 
	unsigned int line_time_in_us;

	uint8_t rate_control_caps;

	uint16_t dsc_slice_height;

	bool os_request_force_ffu;

};



union dmcu_psr_level {
@@ -740,6 +741,7 @@ struct psr_context { 
	unsigned int line_time_in_us;

	uint8_t rate_control_caps;

	uint16_t dsc_slice_height;

	bool os_request_force_ffu;

};



struct colorspace_transform {
@@ -1151,6 +1153,8 @@ struct replay_config { 
	bool replay_video_conferencing_optimization_enabled;

	/* Replay alpm mode */

	enum dc_alpm_mode alpm_mode;

	/* Replay full screen only */

	bool os_request_force_ffu;

};



/* Replay feature flags*/

drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, 
			sizeof(DP_SINK_DEVICE_STR_ID_1)))

		link->psr_settings.force_ffu_mode = 1;



	copy_settings_data->force_ffu_mode = link->psr_settings.force_ffu_mode;

	copy_settings_data->force_ffu_mode = link->psr_settings.force_ffu_mode || psr_context->os_request_force_ffu;



	if (((link->dpcd_caps.fec_cap.bits.FEC_CAPABLE &&

		!link->dc->debug.disable_fec) &&

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

+1 −0
Original line number Diff line number Diff line
@@ -684,6 +684,7 @@ struct replay_context { 
	/* Controller Id used for Dig Fe source select */

	enum controller_id controllerId;

	unsigned int line_time_in_ns;

	bool os_request_force_ffu;

};



enum dc_replay_enable {

drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c

+4 −0
Original line number Diff line number Diff line
@@ -870,6 +870,8 @@ bool edp_setup_psr(struct dc_link *link, 


	psr_context->dsc_slice_height = psr_config->dsc_slice_height;



	psr_context->os_request_force_ffu = psr_config->os_request_force_ffu;



	if (psr) {

		link->psr_settings.psr_feature_enabled = psr->funcs->psr_copy_settings(psr,

			link, psr_context, panel_inst);
@@ -1029,6 +1031,8 @@ bool edp_setup_replay(struct dc_link *link, const struct dc_stream_state *stream 


	replay_context.line_time_in_ns = lineTimeInNs;



	replay_context.os_request_force_ffu = link->replay_settings.config.os_request_force_ffu;



	link->replay_settings.replay_feature_enabled =

			replay->funcs->replay_copy_settings(replay, link, &replay_context, panel_inst);

	if (link->replay_settings.replay_feature_enabled) {