drm/amd/display: Move CLK_BASE_INNER macro

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

Signed-off-by: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 (file)
--- 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 (file)
--- 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)