From e8a0df47623f2467c05222c2592bb2e4947ca1d8 Mon Sep 17 00:00:00 2001
From: Finley Xiao <finley.xiao@rock-chips.com>
Date: Fri, 15 Dec 2017 17:07:45 +0800
Subject: [PATCH] drm/rockchip: Avoid multiple definition

Change-Id: I091eb45fd4ccc30e648d4b743e1f541a8718cc9d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c |  1 +
 drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 15 +++++++++++++++
 include/soc/rockchip/rockchip_dmc.h        | 14 --------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 6efb861410ad..390a19d3b17c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -23,6 +23,7 @@
 #include <soc/rockchip/rockchip_dmc.h>
 
 #include "rockchip_drm_drv.h"
+#include "rockchip_drm_fb.h"
 #include "rockchip_drm_gem.h"
 #include "rockchip_drm_backlight.h"
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h
index 60ce2efed3a7..eae46e205b9b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.h
@@ -31,4 +31,19 @@ rockchip_fb_alloc(struct drm_device *dev, struct drm_mode_fb_cmd2 *mode_cmd,
 
 dma_addr_t rockchip_fb_get_dma_addr(struct drm_framebuffer *fb,
 				    unsigned int plane);
+
+#ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ
+int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte);
+void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte);
+#else
+static inline int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte)
+{
+	return 0;
+}
+
+static inline void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte)
+{
+}
+#endif
+
 #endif /* _ROCKCHIP_DRM_FB_H */
diff --git a/include/soc/rockchip/rockchip_dmc.h b/include/soc/rockchip/rockchip_dmc.h
index 7d1c655e673e..96713f5d0dd5 100644
--- a/include/soc/rockchip/rockchip_dmc.h
+++ b/include/soc/rockchip/rockchip_dmc.h
@@ -33,18 +33,4 @@ static inline int rockchip_drm_register_notifier_to_dmc(struct devfreq *devfreq)
 }
 #endif
 
-#ifdef CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ
-int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte);
-void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte);
-#else
-int rockchip_dmcfreq_vop_bandwidth_request(unsigned int bw_mbyte)
-{
-	return 0;
-}
-
-void rockchip_dmcfreq_vop_bandwidth_update(unsigned int bw_mbyte)
-{
-}
-#endif
-
 #endif