Skip to content

Commit 8774029

Browse files
lillizhuo-amdalexdeucher
authored andcommitted
drm/amd/display: Add DCN35 CLK_MGR
[Why & How] Add CLK_MGR handling for DCN35. v2: Drop stale SMU interfaces (Alex) Signed-off-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 6f8b756 commit 8774029

File tree

11 files changed

+1717
-0
lines changed

11 files changed

+1717
-0
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,6 +1680,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
16801680

16811681
init_data.dcn_reg_offsets = adev->reg_offset[DCE_HWIP][0];
16821682
init_data.nbio_reg_offsets = adev->reg_offset[NBIO_HWIP][0];
1683+
init_data.clk_reg_offsets = adev->reg_offset[CLK_HWIP][0];
16831684

16841685
INIT_LIST_HEAD(&adev->dm.da_list);
16851686

drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,12 @@ AMD_DAL_CLK_MGR_DCN32 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn32/,$(CLK_MGR_DC
172172

173173
AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN32)
174174

175+
###############################################################################
176+
# DCN35
177+
###############################################################################
178+
CLK_MGR_DCN35 = dcn35_smu.o dcn35_clk_mgr.o
179+
180+
AMD_DAL_CLK_MGR_DCN35 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn35/,$(CLK_MGR_DCN35))
181+
182+
AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN35)
175183
endif

drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "dcn315/dcn315_clk_mgr.h"
4949
#include "dcn316/dcn316_clk_mgr.h"
5050
#include "dcn32/dcn32_clk_mgr.h"
51+
#include "dcn35/dcn35_clk_mgr.h"
5152

5253
int clk_mgr_helper_get_active_display_cnt(
5354
struct dc *dc,
@@ -405,6 +406,10 @@ void dc_destroy_clk_mgr(struct clk_mgr *clk_mgr_base)
405406
dcn314_clk_mgr_destroy(clk_mgr);
406407
break;
407408

409+
case AMDGPU_FAMILY_GC_11_5_0:
410+
dcn35_clk_mgr_destroy(clk_mgr);
411+
break;
412+
408413
default:
409414
break;
410415
}

0 commit comments

Comments
 (0)