Commit 9c83768e authored by Austin Zheng's avatar Austin Zheng Committed by Alex Deucher
Browse files

drm/amd/display: Remove old PMO options 



[Why & How]
Removes deprecated or unused PMO options.

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarAustin Zheng <Austin.Zheng@amd.com>
Signed-off-by: default avatarRay Wu <ray.wu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e19cb97e

drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_display_cfg_types.h

+0 −2
Original line number Diff line number Diff line
@@ -423,7 +423,6 @@ struct dml2_stream_parameters { 
		bool disable_dynamic_odm;

		bool disable_subvp;

		int minimum_vblank_idle_requirement_us;

		bool minimize_active_latency_hiding;



		struct {

			struct {
@@ -489,7 +488,6 @@ struct dml2_display_cfg { 
		bool synchronize_ddr_displays_for_uclk_pstate_change;

		bool max_outstanding_when_urgent_expected_disable;

		bool enable_subvp_implicit_pmo; //enables PMO to switch pipe uclk strategy to subvp, and generate phantom programming

		unsigned int best_effort_min_active_latency_hiding_us;

		bool all_streams_blanked;

	} overrides;

};

drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_soc_parameter_types.h

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ struct dml2_soc_qos_parameters { 


struct dml2_soc_power_management_parameters {

	double dram_clk_change_blackout_us;

	double dram_clk_change_read_only_us;

	double dram_clk_change_write_only_us;

	double dram_clk_change_read_only_us; // deprecated

	double dram_clk_change_write_only_us; // deprecated

	double fclk_change_blackout_us;

	double g7_ppt_blackout_us;

	double g7_temperature_read_blackout_us;

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

+1 −5
Original line number Diff line number Diff line
@@ -1962,9 +1962,6 @@ static void reset_display_configuration(struct display_configuation_with_meta *d 


	for (stream_index = 0; stream_index < display_config->display_config.num_streams; stream_index++) {

		display_config->stage3.stream_svp_meta[stream_index].valid = false;



		display_config->display_config.stream_descriptors[stream_index].overrides.minimize_active_latency_hiding = false;

		display_config->display_config.overrides.best_effort_min_active_latency_hiding_us = 0;

	}



	for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {
@@ -1997,7 +1994,6 @@ static void setup_planes_for_drr_by_mask(struct display_configuation_with_meta * 
			plane->overrides.uclk_pstate_change_strategy = dml2_uclk_pstate_change_strategy_force_drr;



			display_config->stage3.pstate_switch_modes[plane_index] = dml2_pstate_method_fw_drr;



		}

	}

}
@@ -2063,7 +2059,6 @@ static void setup_planes_for_vblank_by_mask(struct display_configuation_with_met 
					plane->overrides.reserved_vblank_time_ns);



			display_config->stage3.pstate_switch_modes[plane_index] = dml2_pstate_method_vblank;



		}

	}

}
@@ -2078,6 +2073,7 @@ static void setup_planes_for_vblank_drr_by_mask(struct display_configuation_with 
	for (plane_index = 0; plane_index < display_config->display_config.num_planes; plane_index++) {

		if (is_bit_set_in_bitfield(plane_mask, plane_index)) {

			plane = &display_config->display_config.plane_descriptors[plane_index];



			plane->overrides.reserved_vblank_time_ns = (long)(pmo->soc_bb->power_management_parameters.dram_clk_change_blackout_us * 1000);



			display_config->stage3.pstate_switch_modes[plane_index] = dml2_pstate_method_fw_vblank_drr;