Skip to content

Commit ca87c9a

Browse files
tiancyinalexdeucher
authored andcommitted
drm/amd/display: fix dm irq error message in gpu recover
[Why] Variable adev->crtc_irq.num_types was initialized as the value of adev->mode_info.num_crtc at early_init stage, later at hw_init stage, the num_crtc changed due to the display pipe harvest on some SKUs, but the num_types was not updated accordingly, that cause below error in gpu recover. *ERROR* amdgpu_dm_set_crtc_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_crtc_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_crtc_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_pflip_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_pflip_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_pflip_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_pflip_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_vupdate_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_vupdate_irq_state: crtc is NULL at id :3 *ERROR* amdgpu_dm_set_vupdate_irq_state: crtc is NULL at id :3 [How] Defer the initialization of num_types to eliminate the error logs. Signed-off-by: tiancyin <tianci.yin@amd.com> Reviewed-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 65a2400 commit ca87c9a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4265,6 +4265,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
42654265
/* Update the actual used number of crtc */
42664266
adev->mode_info.num_crtc = adev->dm.display_indexes_num;
42674267

4268+
amdgpu_dm_set_irq_funcs(adev);
4269+
42684270
link_cnt = dm->dc->caps.max_links;
42694271
if (amdgpu_dm_mode_config_init(dm->adev)) {
42704272
DRM_ERROR("DM: Failed to initialize mode config\n");
@@ -4757,8 +4759,6 @@ static int dm_early_init(void *handle)
47574759
break;
47584760
}
47594761

4760-
amdgpu_dm_set_irq_funcs(adev);
4761-
47624762
if (adev->mode_info.funcs == NULL)
47634763
adev->mode_info.funcs = &dm_display_funcs;
47644764

0 commit comments

Comments
 (0)