[PATCH] drm/amdgpu/display: fold DRM_AMD_DC_DCN201 into DRM_AMD_DC_DCN

[Liu, Zhan]

[Public]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: 2021/October/01, Friday 10:31 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: [PATCH] drm/amdgpu/display: fold DRM_AMD_DC_DCN201 into
> DRM_AMD_DC_DCN
>
> No need for a separate kconfig option at this point.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Zhan Liu <zhan.liu at amd.com>

> ---
>  drivers/gpu/drm/amd/display/Kconfig               | 9 ---------
>  drivers/gpu/drm/amd/display/dc/Makefile           | 2 --
>  drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile   | 2 --
>  drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c  | 2 --
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 --
>  drivers/gpu/drm/amd/display/dc/irq/Makefile       | 2 --
>  6 files changed, 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/Kconfig
> b/drivers/gpu/drm/amd/display/Kconfig
> index fb074a6067b2..7dffc04a557e 100644
> --- a/drivers/gpu/drm/amd/display/Kconfig
> +++ b/drivers/gpu/drm/amd/display/Kconfig
> @@ -17,15 +17,6 @@ config DRM_AMD_DC_DCN
>       help
>         Raven, Navi, and newer family support for display engine
>
> -config DRM_AMD_DC_DCN201
> -     bool "Enable DCN201 support in DC"
> -     default y
> -     depends on DRM_AMD_DC && X86
> -     depends on DRM_AMD_DC_DCN
> -     help
> -       Choose this option if you want to have
> -       201 support for display engine
> -
>  config DRM_AMD_DC_HDCP
>       bool "Enable HDCP support in DC"
>       depends on DRM_AMD_DC
> diff --git a/drivers/gpu/drm/amd/display/dc/Makefile
> b/drivers/gpu/drm/amd/display/dc/Makefile
> index 520f58538364..b5482980e995 100644
> --- a/drivers/gpu/drm/amd/display/dc/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/Makefile
> @@ -30,9 +30,7 @@ DC_LIBS += dcn20
>  DC_LIBS += dsc
>  DC_LIBS += dcn10 dml
>  DC_LIBS += dcn21
> -ifdef CONFIG_DRM_AMD_DC_DCN201
>  DC_LIBS += dcn201
> -endif
>  DC_LIBS += dcn30
>  DC_LIBS += dcn301
>  DC_LIBS += dcn302
> 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;
>       }
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index fc490b77f47d..561c10a92bb5 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -224,11 +224,9 @@ struct resource_pool
> *dc_create_resource_pool(struct dc  *dc,
>       case DCN_VERSION_2_1:
>               res_pool = dcn21_create_resource_pool(init_data, dc);
>               break;
> -#if defined(CONFIG_DRM_AMD_DC_DCN201)
>       case DCN_VERSION_2_01:
>               res_pool = dcn201_create_resource_pool(init_data, dc);
>               break;
> -#endif
>       case DCN_VERSION_3_0:
>               res_pool = dcn30_create_resource_pool(init_data, dc);
>               break;
> diff --git a/drivers/gpu/drm/amd/display/dc/irq/Makefile
> b/drivers/gpu/drm/amd/display/dc/irq/Makefile
> index 8a182772eed2..fd739aecf104 100644
> --- a/drivers/gpu/drm/amd/display/dc/irq/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/irq/Makefile
> @@ -94,7 +94,6 @@ AMD_DAL_IRQ_DCN21= $(addprefix
> $(AMDDALPATH)/dc/irq/dcn21/,$(IRQ_DCN21))
>
>  AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN21)
>
> -ifdef CONFIG_DRM_AMD_DC_DCN201
>
> #################################################################
> ##############
>  # DCN 201
>
> #################################################################
> ##############
> @@ -103,7 +102,6 @@ IRQ_DCN201 = irq_service_dcn201.o
>  AMD_DAL_IRQ_DCN201 = $(addprefix
> $(AMDDALPATH)/dc/irq/dcn201/,$(IRQ_DCN201))
>
>  AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN201) -endif
>
>
> #################################################################
> ##############
>  # DCN 30
> --
> 2.31.1