Commit 851c5f24 authored by Melissa Wen's avatar Melissa Wen Committed by Alex Deucher
Browse files

drm/amd/display: detach fpu operations from dcn10_validate_bandwidth in calcs 



dcn10_validate_bandwidth is only used on dcn10 files, but is declared in
dcn_calcs files. Rename dcn10_* to dcn_* in calcs, remove DC_FP_* wrapper
inside DML folder and create an specific dcn10_validate_bandwidth in
dcn10_resources that calls dcn_validate_bandwidth and properly wraps that
FPU function with DC_FP_* macro.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarMelissa Wen <mwen@igalia.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ebd9c071

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

+14 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,20 @@ static void dcn10_destroy_resource_pool(struct resource_pool **pool) 
	*pool = NULL;

}



static bool dcn10_validate_bandwidth(

		struct dc *dc,

		struct dc_state *context,

		bool fast_validate)

{

	bool voltage_supported;



	DC_FP_START();

	voltage_supported = dcn_validate_bandwidth(dc, context, fast_validate);

	DC_FP_END();



	return voltage_supported;

}



static enum dc_status dcn10_validate_plane(const struct dc_plane_state *plane_state, struct dc_caps *caps)

{

	if (plane_state->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN

drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c

+1 −4
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ static unsigned int get_highest_allowed_voltage_level(uint32_t chip_family, 
	return 4;

}



bool dcn10_validate_bandwidth(

bool dcn_validate_bandwidth(

		struct dc *dc,

		struct dc_state *context,

		bool fast_validate)
@@ -790,7 +790,6 @@ bool dcn10_validate_bandwidth( 
		dcn_bw_sync_calcs_and_dml(dc);



	memset(v, 0, sizeof(*v));

	DC_FP_START();



	v->sr_exit_time = dc->dcn_soc->sr_exit_time;

	v->sr_enter_plus_exit_time = dc->dcn_soc->sr_enter_plus_exit_time;
@@ -1323,8 +1322,6 @@ bool dcn10_validate_bandwidth( 
	bw_limit = dc->dcn_soc->percent_disp_bw_limit * v->fabric_and_dram_bandwidth_vmax0p9;

	bw_limit_pass = (v->total_data_read_bandwidth / 1000.0) < bw_limit;



	DC_FP_END();



	PERFORMANCE_TRACE_END();

	BW_VAL_TRACE_FINISH();

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

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ struct dcn_ip_params { 
};

extern const struct dcn_ip_params dcn10_ip_defaults;



bool dcn10_validate_bandwidth(

bool dcn_validate_bandwidth(

		struct dc *dc,

		struct dc_state *context,

		bool fast_validate);