[PATCH 04/26] drm/amd/display: Move CLK_BASE_INNER macro

[sunpeng.li at amd.com]

From: Eric Yang <Eric.Yang2 at amd.com>

This macro is specificly used by RV1. Move it to the appropriate
location.

Signed-off-by: Eric Yang <Eric.Yang2 at amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr at amd.com>
Acked-by: Leo Li <sunpeng.li at amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c   | 4 ++++
 drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c b/drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c
index 887814c..e99af22 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c
@@ -36,6 +36,10 @@
 
 #include "dce/dce_clk_mgr.h"
 
+#define CLK_BASE_INNER(inst) \
+	CLK_BASE__INST ## inst ## _SEG0
+
+
 #define CLK_REG(reg_name, block, inst)\
 	CLK_BASE(mm ## block ## _ ## inst ## _ ## reg_name ## _BASE_IDX) + \
 					mm ## block ## _ ## inst ## _ ## reg_name
diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h
index 42f72c4..53f6286 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h
@@ -49,8 +49,7 @@
 	clk_mgr->ctx->logger
 
 
-#define CLK_BASE_INNER(inst) \
-	CLK_BASE__INST ## inst ## _SEG0
+
 
 #define CLK_BASE(inst) \
 	CLK_BASE_INNER(inst)
-- 
2.7.4