From 519607a2f7798decb9c891a4f706aaf780f5a677 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 1 Oct 2021 10:29:02 -0400 Subject: drm/amdgpu/display: fold DRM_AMD_DC_DCN201 into DRM_AMD_DC_DCN No need for a separate kconfig option at this point. Reviewed-by: Zhan Liu Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 -- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 -- 2 files changed, 4 deletions(-) (limited to 'drivers/gpu/drm/amd/display/dc/clk_mgr') diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile index 7f70985b7a1b..6bd73e49a6d2 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile @@ -93,7 +93,6 @@ AMD_DAL_CLK_MGR_DCN20 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn20/,$(CLK_MGR_DC AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN20) -ifdef CONFIG_DRM_AMD_DC_DCN201 ############################################################################### # DCN201 ############################################################################### @@ -102,7 +101,6 @@ CLK_MGR_DCN201 = dcn201_clk_mgr.o AMD_DAL_CLK_MGR_DCN201 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn201/,$(CLK_MGR_DCN201)) AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN201) -endif ############################################################################### # DCN21 diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c index 421f5135b701..1548b2a3fe03 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c @@ -257,12 +257,10 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *p dcn3_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); return &clk_mgr->base; } -#if defined(CONFIG_DRM_AMD_DC_DCN201) if (asic_id.chip_id == DEVICE_ID_NV_13FE) { dcn201_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); return &clk_mgr->base; } -#endif dcn20_clk_mgr_construct(ctx, clk_mgr, pp_smu, dccg); return &clk_mgr->base; } -- cgit v1.2.3-59-g8ed1b