diff options
| author | Eric Yang <Eric.Yang2@amd.com> | 2019-05-07 17:29:11 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-05-31 10:39:30 -0500 |
| commit | a7f90cbc0ee416ffcb2097583bf5364ffc3818bb (patch) | |
| tree | 2c5ae8aff7765149d87fede560adeda4cf0c3dab | |
| parent | 48ea75f99a58d81acfc99bc8d76f5f5107a4f226 (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/rv1_clk_mgr_clk.c | 4 | ||||
| -rw-r--r-- | 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 887814c65bacd..e99af225845a6 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 42f72c44e6f9f..53f6286b2fd60 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) |