Commit 16b2f2ed authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

amdgpu/dc: inline a bunch of the dml wrappers. 



This reduces the code size.

This is basically a redo of Dave's change with the same name
on top of the latest DML.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 565f26a3

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c

+2 −0
Original line number Diff line number Diff line 
#include "display_mode_lib.h"

#include "display_mode_vba.h"



#include "dml_inline_defs.h"



static const unsigned int NumberOfStates = DC__VOLTAGE_STATES;



static void fetch_socbb_params(struct display_mode_lib *mode_lib);

drivers/gpu/drm/amd/display/dc/dml/display_rq_dlg_calc.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ static void calculate_ttu_cursor(struct display_mode_lib *mode_lib, 
		unsigned int cur_width,

		enum cursor_bpp cur_bpp);



#include "dml_inline_defs.h"



static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)

{

	unsigned int ret_val = 0;

drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include "dml1_display_rq_dlg_calc.h"

#include "display_mode_lib.h"



#include "dml_inline_defs.h"



static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)

{

	unsigned int ret_val = 0;

drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c

+1 −66
Original line number Diff line number Diff line
@@ -26,37 +26,7 @@ 
#include "dml_common_defs.h"

#include "../calcs/dcn_calc_math.h"



double dml_min(double a, double b)

{

	return (double) dcn_bw_min2(a, b);

}



double dml_max(double a, double b)

{

	return (double) dcn_bw_max2(a, b);

}

double dml_max3(double a, double b, double c)

{

	return dml_max(dml_max(a, b), c);

}

double dml_max4(double a, double b, double c, double d)

{

	return dml_max(dml_max(a, b), dml_max(c, d));

}

double dml_max5(double a, double b, double c, double d, double e)

{

	return dml_max(dml_max4(a, b, c, d), e);

}



double dml_ceil(double a, double granularity)

{

	return (double) dcn_bw_ceil2(a, granularity);

}



double dml_floor(double a, double granularity)

{

	return (double) dcn_bw_floor2(a, granularity);

}

#include "dml_inline_defs.h"



double dml_round(double a)

{
@@ -70,16 +40,6 @@ double dml_round(double a) 
		return floor;

}



int dml_log2(double x)

{

	return dml_round((double)dcn_bw_log(x, 2));

}



double dml_pow(double a, int exp)

{

	return (double) dcn_bw_pow(a, exp);

}



unsigned int dml_round_to_multiple(

	unsigned int num,

	unsigned int multiple,
@@ -101,16 +61,6 @@ unsigned int dml_round_to_multiple( 
		return (num - remainder);

}



double dml_fmod(double f, int val)

{

	return (double) dcn_bw_mod(f, val);

}



double dml_ceil_2(double f)

{

	return (double) dcn_bw_ceil2(f, 2);

}



bool dml_util_is_420(enum source_format_class sorce_format)

{

	bool val = false;
@@ -143,18 +93,3 @@ bool dml_util_is_420(enum source_format_class sorce_format) 


	return val;

}
 


double dml_ceil_ex(double x, double granularity)

{

	return (double) dcn_bw_ceil2(x, granularity);

}



double dml_floor_ex(double x, double granularity)

{

	return (double) dcn_bw_floor2(x, granularity);

}



double dml_log(double x, double base)

{

	return (double) dcn_bw_log(x, base);

}

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

+0 −14
Original line number Diff line number Diff line
@@ -34,23 +34,9 @@ 
#define dml_print(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); }

#define DTRACE(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); }



double dml_min(double a, double b);

double dml_max(double a, double b);

double dml_max3(double a, double b, double c);

double dml_max4(double a, double b, double c, double d);

double dml_max5(double a, double b, double c, double d, double e);

bool dml_util_is_420(enum source_format_class sorce_format);

double dml_ceil_ex(double x, double granularity);

double dml_floor_ex(double x, double granularity);

double dml_log(double x, double base);

double dml_ceil(double a, double granularity);

double dml_floor(double a, double granularity);

double dml_round(double a);

int dml_log2(double x);

double dml_pow(double a, int exp);

unsigned int dml_round_to_multiple(

			unsigned int num, unsigned int multiple, bool up);

double dml_fmod(double f, int val);

double dml_ceil_2(double f);



#endif /* __DC_COMMON_DEFS_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE