Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/display: Handle Renoir in DC

add Renoir DCN version in DC and handle it

Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Bhawanpreet Lakha and committed by
Alex Deucher
e22ece54 aad37f26

+20
+5
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
··· 67 67 *h = dal_cmd_tbl_helper_dce112_get_table2(); 68 68 return true; 69 69 #endif 70 + #if defined(CONFIG_DRM_AMD_DC_DCN2_1) 71 + case DCN_VERSION_2_1: 72 + *h = dal_cmd_tbl_helper_dce112_get_table2(); 73 + return true; 74 + #endif 70 75 case DCE_VERSION_12_0: 71 76 case DCE_VERSION_12_1: 72 77 *h = dal_cmd_tbl_helper_dce112_get_table2();
+12
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 52 52 #if defined(CONFIG_DRM_AMD_DC_DCN2_0) 53 53 #include "dcn20/dcn20_resource.h" 54 54 #endif 55 + #if defined(CONFIG_DRM_AMD_DC_DCN2_1) 56 + #include "dcn21/dcn21_resource.h" 57 + #endif 55 58 #include "dce120/dce120_resource.h" 56 59 57 60 #define DC_LOGGER_INIT(logger) ··· 104 101 dc_version = DCN_VERSION_1_0; 105 102 if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) 106 103 dc_version = DCN_VERSION_1_01; 104 + #if defined(CONFIG_DRM_AMD_DC_DCN2_1) 105 + if (ASICREV_IS_RENOIR(asic_id.hw_internal_rev)) 106 + dc_version = DCN_VERSION_2_1; 107 + #endif 107 108 break; 108 109 #endif 109 110 ··· 173 166 #if defined(CONFIG_DRM_AMD_DC_DCN2_0) 174 167 case DCN_VERSION_2_0: 175 168 res_pool = dcn20_create_resource_pool(init_data, dc); 169 + break; 170 + #endif 171 + #if defined(CONFIG_DRM_AMD_DC_DCN2_1) 172 + case DCN_VERSION_2_1: 173 + res_pool = dcn21_create_resource_pool(init_data, dc); 176 174 break; 177 175 #endif 178 176
+3
drivers/gpu/drm/amd/display/include/dal_types.h
··· 49 49 #if defined(CONFIG_DRM_AMD_DC_DCN2_0) 50 50 DCN_VERSION_2_0, 51 51 #endif 52 + #if defined(CONFIG_DRM_AMD_DC_DCN2_1) 53 + DCN_VERSION_2_1, 54 + #endif 52 55 DCN_VERSION_MAX 53 56 }; 54 57