1 files changed, 87 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2682-amdgpu-dc-inline-dml_round_to_multiple.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2682-amdgpu-dc-inline-dml_round_to_multiple.patch
new file mode 100644
index 00000000..ec8e80d1
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2682-amdgpu-dc-inline-dml_round_to_multiple.patch
@@ -0,0 +1,87 @@
+From f0c13af83d474d01f88dd70e5752e596a347e4b8 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 29 Sep 2017 17:13:31 +1000
+Subject: [PATCH 2682/4131] amdgpu/dc: inline dml_round_to_multiple
+
+turns out to be a win to inline this.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c | 19 -------------------
+ drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h |  2 --
+ drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 19 +++++++++++++++++++
+ 3 files changed, 19 insertions(+), 21 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
+index 1683514..b953b02 100644
+--- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.c
+@@ -40,23 +40,4 @@ double dml_round(double a)
+ 		return floor;
+ }
+ 
+-unsigned int dml_round_to_multiple(
+-	unsigned int num,
+-	unsigned int multiple,
+-	bool up)
+-{
+-	unsigned int remainder;
+-
+-	if (multiple == 0)
+-		return num;
+-
+-	remainder = num % multiple;
+ 
+-	if (remainder == 0)
+-		return num;
+-
+-	if (up)
+-		return (num + multiple - remainder);
+-	else
+-		return (num - remainder);
+-}
+diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
+index e11d123..b2847bc 100644
+--- a/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_common_defs.h
+@@ -35,7 +35,5 @@
+ #define DTRACE(str, ...) {dm_logger_write(mode_lib->logger, LOG_DML, str, ##__VA_ARGS__); }
+ 
+ double dml_round(double a);
+-unsigned int dml_round_to_multiple(
+-			unsigned int num, unsigned int multiple, bool up);
+ 
+ #endif /* __DC_COMMON_DEFS_H__ */
+diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
+index 105c672..e68086b 100644
+--- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
++++ b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h
+@@ -99,4 +99,23 @@ static inline double dml_log(double x, double base)
+ 	return (double) dcn_bw_log(x, base);
+ }
+ 
++static inline unsigned int dml_round_to_multiple(unsigned int num,
++						 unsigned int multiple,
++						 bool up)
++{
++	unsigned int remainder;
++
++	if (multiple == 0)
++		return num;
++
++	remainder = num % multiple;
++
++	if (remainder == 0)
++		return num;
++
++	if (up)
++		return (num + multiple - remainder);
++	else
++		return (num - remainder);
++}
+ #endif
+-- 
+2.7.4
+