Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8dd5715 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amd/display: Use real number of CRTCs and HPDs in set_irq_funcs 



Corresponding to the previous non-DC change.

Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d794b9f8

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

+2 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,6 @@ static int dm_early_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	adev->ddev->driver->driver_features |= DRIVER_ATOMIC;

	amdgpu_dm_set_irq_funcs(adev);



	switch (adev->asic_type) {

	case CHIP_BONAIRE:
@@ -1664,6 +1663,8 @@ static int dm_early_init(void *handle) 
		return -EINVAL;

	}



	amdgpu_dm_set_irq_funcs(adev);



	if (adev->mode_info.funcs == NULL)

		adev->mode_info.funcs = &dm_display_funcs;

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

+6 −3
Original line number Diff line number Diff line
@@ -683,13 +683,16 @@ static const struct amdgpu_irq_src_funcs dm_hpd_irq_funcs = { 


void amdgpu_dm_set_irq_funcs(struct amdgpu_device *adev)

{

	adev->crtc_irq.num_types = AMDGPU_CRTC_IRQ_LAST;

	if (adev->mode_info.num_crtc > 0)

		adev->crtc_irq.num_types = AMDGPU_CRTC_IRQ_VLINE1 + adev->mode_info.num_crtc;

	else

		adev->crtc_irq.num_types = 0;

	adev->crtc_irq.funcs = &dm_crtc_irq_funcs;



	adev->pageflip_irq.num_types = AMDGPU_PAGEFLIP_IRQ_LAST;

	adev->pageflip_irq.num_types = adev->mode_info.num_crtc;

	adev->pageflip_irq.funcs = &dm_pageflip_irq_funcs;



	adev->hpd_irq.num_types = AMDGPU_HPD_LAST;

	adev->hpd_irq.num_types = adev->mode_info.num_hpd;

	adev->hpd_irq.funcs = &dm_hpd_irq_funcs;

}