2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 72a08776a6a6..f46cef9bde68 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -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;
 
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index ca5d0d1581dc..1874b6cee6af 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -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;
 }