Commit 3e8c3108 authored by Dave Airlie's avatar Dave Airlie Committed by Alex Deucher

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

This reduces code size.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d1209512
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "display_mode_support.h" #include "display_mode_support.h"
#include "display_mode_lib.h" #include "display_mode_lib.h"
#include "dml_inline_defs.h"
int dml_ms_check( int dml_ms_check(
struct display_mode_lib *mode_lib, struct display_mode_lib *mode_lib,
struct _vcs_dpi_display_e2e_pipe_params_st *e2e, struct _vcs_dpi_display_e2e_pipe_params_st *e2e,
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "display_rq_dlg_calc.h" #include "display_rq_dlg_calc.h"
#include "display_mode_lib.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) static unsigned int get_bytes_per_element(enum source_format_class source_format, bool is_chroma)
{ {
unsigned int ret_val = 0; unsigned int ret_val = 0;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
*/ */
#include "display_watermark.h" #include "display_watermark.h"
#include "display_mode_lib.h" #include "display_mode_lib.h"
#include "dml_inline_defs.h"
static void get_bytes_per_pixel( static void get_bytes_per_pixel(
enum source_format_class format, enum source_format_class format,
......
...@@ -26,26 +26,7 @@ ...@@ -26,26 +26,7 @@
#include "dml_common_defs.h" #include "dml_common_defs.h"
#include "../calcs/dcn_calc_math.h" #include "../calcs/dcn_calc_math.h"
double dml_min(double a, double b) #include "dml_inline_defs.h"
{
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 dml_round(double a)
{ {
double round_pt = 0.5; double round_pt = 0.5;
...@@ -58,16 +39,6 @@ double dml_round(double a) ...@@ -58,16 +39,6 @@ double dml_round(double a)
return floor; 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 dml_round_to_multiple(
unsigned int num, unsigned int num,
unsigned int multiple, unsigned int multiple,
...@@ -89,16 +60,6 @@ unsigned int dml_round_to_multiple( ...@@ -89,16 +60,6 @@ unsigned int dml_round_to_multiple(
return (num - remainder); 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 dml_util_is_420(enum source_format_class sorce_format)
{ {
bool val = false; bool val = false;
...@@ -131,18 +92,3 @@ bool dml_util_is_420(enum source_format_class sorce_format) ...@@ -131,18 +92,3 @@ bool dml_util_is_420(enum source_format_class sorce_format)
return val; 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);
}
...@@ -32,20 +32,9 @@ ...@@ -32,20 +32,9 @@
#define DTRACE(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);
bool dml_util_is_420(enum source_format_class sorce_format); 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); 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 dml_round_to_multiple(
unsigned int num, unsigned int multiple, bool up); 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__ */ #endif /* __DC_COMMON_DEFS_H__ */
#ifndef __DML_INLINE_DEFS_H__
#define __DML_INLINE_DEFS_H__
#include "dml_common_defs.h"
#include "../calcs/dcn_calc_math.h"
static inline double dml_min(double a, double b)
{
return (double) dcn_bw_min2(a, b);
}
static inline double dml_max(double a, double b)
{
return (double) dcn_bw_max2(a, b);
}
static inline double dml_ceil(double a)
{
return (double) dcn_bw_ceil2(a, 1);
}
static inline double dml_floor(double a)
{
return (double) dcn_bw_floor2(a, 1);
}
static inline int dml_log2(double x)
{
return dml_round((double)dcn_bw_log(x, 2));
}
static inline double dml_pow(double a, int exp)
{
return (double) dcn_bw_pow(a, exp);
}
static inline double dml_fmod(double f, int val)
{
return (double) dcn_bw_mod(f, val);
}
static inline double dml_ceil_2(double f)
{
return (double) dcn_bw_ceil2(f, 2);
}
static inline double dml_ceil_ex(double x, double granularity)
{
return (double) dcn_bw_ceil2(x, granularity);
}
static inline double dml_floor_ex(double x, double granularity)
{
return (double) dcn_bw_floor2(x, granularity);
}
static inline double dml_log(double x, double base)
{
return (double) dcn_bw_log(x, base);
}
#endif
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "soc_bounding_box.h" #include "soc_bounding_box.h"
#include "display_mode_lib.h" #include "display_mode_lib.h"
#include "dml_inline_defs.h"
void dml_socbb_set_latencies( void dml_socbb_set_latencies(
struct display_mode_lib *mode_lib, struct display_mode_lib *mode_lib,
struct _vcs_dpi_soc_bounding_box_st *from_box) struct _vcs_dpi_soc_bounding_box_st *from_box)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment