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

drm/amd/display: configure dc hw resource for DCN 3.1.6

- set DC version
- add construct/destroy dc clock management function
- register dcn interrupt handler

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Prike Liang and committed by
Alex Deucher
de7cc1b4 f3f6eff8

+31 -4
+13 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 114 114 MODULE_FIRMWARE(FIRMWARE_BEIGE_GOBY_DMUB); 115 115 #define FIRMWARE_YELLOW_CARP_DMUB "amdgpu/yellow_carp_dmcub.bin" 116 116 MODULE_FIRMWARE(FIRMWARE_YELLOW_CARP_DMUB); 117 + #define FIRMWARE_DCN316_DMUB "amdgpu/dcn_3_1_6_dmcub.bin" 118 + MODULE_FIRMWARE(FIRMWARE_DCN316_DMUB); 117 119 118 120 #define FIRMWARE_RAVEN_DMCU "amdgpu/raven_dmcu.bin" 119 121 MODULE_FIRMWARE(FIRMWARE_RAVEN_DMCU); ··· 1803 1801 case IP_VERSION(3, 0, 1): 1804 1802 case IP_VERSION(3, 1, 2): 1805 1803 case IP_VERSION(3, 1, 3): 1804 + case IP_VERSION(3, 1, 6): 1806 1805 return 0; 1807 1806 default: 1808 1807 break; ··· 1918 1915 case IP_VERSION(3, 1, 3): 1919 1916 dmub_asic = (adev->external_rev_id == YELLOW_CARP_B0) ? DMUB_ASIC_DCN31B : DMUB_ASIC_DCN31; 1920 1917 fw_name_dmub = FIRMWARE_YELLOW_CARP_DMUB; 1918 + break; 1919 + case IP_VERSION(3, 1, 6): 1920 + dmub_asic = DMUB_ASIC_DCN31B; 1921 + fw_name_dmub = FIRMWARE_DCN316_DMUB; 1921 1922 break; 1922 1923 1923 1924 default: ··· 4231 4224 case IP_VERSION(3, 0, 0): 4232 4225 case IP_VERSION(3, 1, 2): 4233 4226 case IP_VERSION(3, 1, 3): 4227 + case IP_VERSION(3, 1, 6): 4234 4228 case IP_VERSION(2, 1, 0): 4235 4229 if (register_outbox_irq_handlers(dm->adev)) { 4236 4230 DRM_ERROR("DM: Failed to initialize IRQ\n"); ··· 4248 4240 switch (adev->ip_versions[DCE_HWIP][0]) { 4249 4241 case IP_VERSION(3, 1, 2): 4250 4242 case IP_VERSION(3, 1, 3): 4243 + case IP_VERSION(3, 1, 6): 4251 4244 psr_feature_enabled = true; 4252 4245 break; 4253 4246 default: ··· 4366 4357 case IP_VERSION(3, 0, 1): 4367 4358 case IP_VERSION(3, 1, 2): 4368 4359 case IP_VERSION(3, 1, 3): 4360 + case IP_VERSION(3, 1, 6): 4369 4361 if (dcn10_register_irq_handlers(dm->adev)) { 4370 4362 DRM_ERROR("DM: Failed to initialize IRQ\n"); 4371 4363 goto fail; ··· 4552 4542 case IP_VERSION(2, 1, 0): 4553 4543 case IP_VERSION(3, 1, 2): 4554 4544 case IP_VERSION(3, 1, 3): 4545 + case IP_VERSION(3, 1, 6): 4555 4546 adev->mode_info.num_crtc = 4; 4556 4547 adev->mode_info.num_hpd = 4; 4557 4548 adev->mode_info.num_dig = 4; ··· 5225 5214 case AMDGPU_FAMILY_NV: 5226 5215 case AMDGPU_FAMILY_VGH: 5227 5216 case AMDGPU_FAMILY_YC: 5217 + case AMDGPU_FAMILY_GC_10_3_7: 5228 5218 if (adev->ip_versions[GC_HWIP][0] >= IP_VERSION(10, 3, 0)) 5229 5219 add_gfx10_3_modifiers(adev, mods, &size, &capacity); 5230 5220 else ··· 6192 6180 if (stream->link && stream->link->local_sink) 6193 6181 max_dsc_target_bpp_limit_override = 6194 6182 stream->link->local_sink->edid_caps.panel_patch.max_dsc_target_bpp_limit; 6195 - 6183 + 6196 6184 /* Set DSC policy according to dsc_clock_en */ 6197 6185 dc_dsc_policy_set_enable_dsc_when_not_needed( 6198 6186 aconnector->dsc_settings.dsc_force_enable == DSC_CLK_FORCE_ENABLE);
+2 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
··· 663 663 INIT_DELAYED_WORK(&hdcp_work[i].property_validate_dwork, event_property_validate); 664 664 665 665 hdcp_work[i].hdcp.config.psp.handle = &adev->psp; 666 - if (dc->ctx->dce_version == DCN_VERSION_3_1) 666 + if (dc->ctx->dce_version == DCN_VERSION_3_1 || 667 + dc->ctx->dce_version == DCN_VERSION_3_16) 667 668 hdcp_work[i].hdcp.config.psp.caps.dtm_v3_supported = 1; 668 669 hdcp_work[i].hdcp.config.ddc.handle = dc_get_link_at_index(dc, i); 669 670 hdcp_work[i].hdcp.config.ddc.funcs.write_i2c = lp_write_i2c;
+1
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
··· 76 76 case DCN_VERSION_3_02: 77 77 case DCN_VERSION_3_03: 78 78 case DCN_VERSION_3_1: 79 + case DCN_VERSION_3_16: 79 80 *h = dal_cmd_tbl_helper_dce112_get_table2(); 80 81 return true; 81 82 #endif
+3 -1
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c
··· 278 278 return &clk_mgr->base.base; 279 279 } 280 280 break; 281 - case FAMILY_YELLOW_CARP: { 281 + case FAMILY_YELLOW_CARP: 282 + case AMDGPU_FAMILY_GC_10_3_7:{ 282 283 struct clk_mgr_dcn31 *clk_mgr = kzalloc(sizeof(*clk_mgr), GFP_KERNEL); 283 284 284 285 if (clk_mgr == NULL) { ··· 323 322 break; 324 323 325 324 case FAMILY_YELLOW_CARP: 325 + case AMDGPU_FAMILY_GC_10_3_7: 326 326 dcn31_clk_mgr_destroy(clk_mgr); 327 327 break; 328 328
+4
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
··· 155 155 if (ASICREV_IS_YELLOW_CARP(asic_id.hw_internal_rev)) 156 156 dc_version = DCN_VERSION_3_1; 157 157 break; 158 + case AMDGPU_FAMILY_GC_10_3_7: 159 + if (ASICREV_IS_GC_10_3_7(asic_id.hw_internal_rev)) 160 + dc_version = DCN_VERSION_3_16; 161 + break; 158 162 #endif 159 163 160 164 default:
+1
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c
··· 114 114 case DCN_VERSION_3_02: 115 115 case DCN_VERSION_3_03: 116 116 case DCN_VERSION_3_1: 117 + case DCN_VERSION_3_16: 117 118 dal_hw_factory_dcn30_init(factory); 118 119 return true; 119 120 #endif
+1
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c
··· 109 109 case DCN_VERSION_3_02: 110 110 case DCN_VERSION_3_03: 111 111 case DCN_VERSION_3_1: 112 + case DCN_VERSION_3_16: 112 113 dal_hw_translate_dcn30_init(translate); 113 114 return true; 114 115 #endif
+5 -1
drivers/gpu/drm/amd/display/include/dal_asic_id.h
··· 227 227 #endif 228 228 229 229 #define FAMILY_YELLOW_CARP 146 230 - 231 230 #define YELLOW_CARP_A0 0x01 232 231 #define YELLOW_CARP_B0 0x20 233 232 #define YELLOW_CARP_UNKNOWN 0xFF ··· 235 236 #define ASICREV_IS_YELLOW_CARP(eChipRev) ((eChipRev >= YELLOW_CARP_A0) && (eChipRev < YELLOW_CARP_UNKNOWN)) 236 237 #endif 237 238 239 + #define AMDGPU_FAMILY_GC_10_3_7 151 240 + #define GC_10_3_7_A0 0x01 241 + #define GC_10_3_7_UNKNOWN 0xFF 242 + 243 + #define ASICREV_IS_GC_10_3_7(eChipRev) ((eChipRev >= GC_10_3_7_A0) && (eChipRev < GC_10_3_7_UNKNOWN)) 238 244 239 245 /* 240 246 * ASIC chip ID
+1
drivers/gpu/drm/amd/display/include/dal_types.h
··· 57 57 DCN_VERSION_3_02, 58 58 DCN_VERSION_3_03, 59 59 DCN_VERSION_3_1, 60 + DCN_VERSION_3_16, 60 61 DCN_VERSION_MAX 61 62 }; 62 63