Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 711b55f3 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

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



This reverts commit 3e8c3108.

Unfortunately these clash with our DML update from the HW guys.
Will attempt to reroll them after.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e168df36

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

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "display_mode_support.h"

#include "display_mode_lib.h"



#include "dml_inline_defs.h"

int dml_ms_check(

		struct display_mode_lib *mode_lib,

		struct _vcs_dpi_display_e2e_pipe_params_st *e2e,

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

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include "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/display_watermark.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
 */

#include "display_watermark.h"

#include "display_mode_lib.h"

#include "dml_inline_defs.h"



static void get_bytes_per_pixel(

		enum source_format_class format,

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

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

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



#include "dml_inline_defs.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_ceil(double a)

{

	return (double) dcn_bw_ceil2(a, 1);

}



double dml_floor(double a)

{

	return (double) dcn_bw_floor2(a, 1);

}



double dml_round(double a)

{

	double round_pt = 0.5;
@@ -39,6 +58,16 @@ 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,
@@ -60,6 +89,16 @@ 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;
@@ -92,3 +131,18 @@ 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

+11 −0
Original line number Diff line number Diff line
@@ -32,9 +32,20 @@ 


#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);

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 dml_floor(double a);

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__ */