diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2020-11-02 15:37:34 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2020-11-04 17:11:37 -0500 |
commit | 20f2ffe504728612d7b0c34e4f8280e34251e704 (patch) | |
tree | ab97de569be30e009ba6e5087f3f6c775167e46c /drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c | |
parent | aeee2a48ec9239790b7c9a5c14dfb2a12554322f (diff) | |
download | linux-stable-20f2ffe504728612d7b0c34e4f8280e34251e704.tar.gz linux-stable-20f2ffe504728612d7b0c34e4f8280e34251e704.tar.bz2 linux-stable-20f2ffe504728612d7b0c34e4f8280e34251e704.zip |
drm/amdgpu: fold CONFIG_DRM_AMD_DC_DCN3* into CONFIG_DRM_AMD_DC_DCN (v3)
Avoids confusion in configurations.
v2: fix build when CONFIG_DRM_AMD_DC_DCN is disabled
v3: rebase on latest code
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com> (v1)
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c index eb34f2e4aa0f..7736c92d55c4 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c @@ -70,20 +70,8 @@ bool dal_bios_parser_init_cmd_tbl_helper2( case DCN_VERSION_1_01: case DCN_VERSION_2_0: case DCN_VERSION_2_1: - *h = dal_cmd_tbl_helper_dce112_get_table2(); - return true; -#endif -#if defined(CONFIG_DRM_AMD_DC_DCN3_0) case DCN_VERSION_3_0: - *h = dal_cmd_tbl_helper_dce112_get_table2(); - return true; -#endif -#if defined(CONFIG_DRM_AMD_DC_DCN3_01) case DCN_VERSION_3_01: - *h = dal_cmd_tbl_helper_dce112_get_table2(); - return true; -#endif -#if defined(CONFIG_DRM_AMD_DC_DCN3_02) case DCN_VERSION_3_02: *h = dal_cmd_tbl_helper_dce112_get_table2(); return true; |