Re: [PATCH 1/3] amdgpu/dce: Use actual number of CRTCs and HPDs in set_irq_funcs

[Christian König]

Am 26.10.2017 um 16:46 schrieb Michel Dänzer:

From: Michel Dänzer <michel.daen...@amd.com>

Hardcoding the maximum numbers could result in spurious error messages
from the IRQ state callbacks, e.g. on Polaris 11/12:

[drm:dce_v11_0_set_pageflip_irq_state [amdgpu]] *ERROR* invalid pageflip crtc 5
[drm:amdgpu_irq_disable_all [amdgpu]] *ERROR* error disabling interrupt (-22)

Signed-off-by: Michel Dänzer <michel.daen...@amd.com>

Acked-by: Christian König <christian.koe...@amd.com> for the whole series.

---
  drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 12 ++++++++----
  drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 12 ++++++++----
  drivers/gpu/drm/amd/amdgpu/dce_v6_0.c  | 12 ++++++++----
  drivers/gpu/drm/amd/amdgpu/dce_v8_0.c  | 12 ++++++++----
  4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 
b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 4e519dc42916..f3dd6b7bfd4d 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2773,7 +2773,6 @@ static int dce_v10_0_early_init(void *handle)
        adev->audio_endpt_wreg = &dce_v10_0_audio_endpt_wreg;

dce_v10_0_set_display_funcs(adev);

-       dce_v10_0_set_irq_funcs(adev);

adev->mode_info.num_crtc = dce_v10_0_get_num_crtc(adev); @@ -2788,6 +2787,8 @@ static int dce_v10_0_early_init(void *handle)

                return -EINVAL;
        }

+ dce_v10_0_set_irq_funcs(adev);

+
        return 0;
  }

@@ -3635,13 +3636,16 @@ static const struct amdgpu_irq_src_funcs dce_v10_0_hpd_irq_funcs = { static void dce_v10_0_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 = &dce_v10_0_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 = &dce_v10_0_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 = &dce_v10_0_hpd_irq_funcs;
  }

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

index 11edc75edaa9..be25706e5f07 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2876,7 +2876,6 @@ static int dce_v11_0_early_init(void *handle)
        adev->audio_endpt_wreg = &dce_v11_0_audio_endpt_wreg;

dce_v11_0_set_display_funcs(adev);

-       dce_v11_0_set_irq_funcs(adev);

adev->mode_info.num_crtc = dce_v11_0_get_num_crtc(adev); @@ -2903,6 +2902,8 @@ static int dce_v11_0_early_init(void *handle)

                return -EINVAL;
        }

+ dce_v11_0_set_irq_funcs(adev);

+
        return 0;
  }

@@ -3759,13 +3760,16 @@ static const struct amdgpu_irq_src_funcs dce_v11_0_hpd_irq_funcs = { static void dce_v11_0_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 = &dce_v11_0_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 = &dce_v11_0_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 = &dce_v11_0_hpd_irq_funcs;
  }

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

index a51e35f824a1..bd2c4f727df6 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -2639,7 +2639,6 @@ static int dce_v6_0_early_init(void *handle)
        adev->audio_endpt_wreg = &dce_v6_0_audio_endpt_wreg;

dce_v6_0_set_display_funcs(adev);

-       dce_v6_0_set_irq_funcs(adev);

adev->mode_info.num_crtc = dce_v6_0_get_num_crtc(adev); @@ -2658,6 +2657,8 @@ static int dce_v6_0_early_init(void *handle)

                return -EINVAL;
        }

+ dce_v6_0_set_irq_funcs(adev);

+
        return 0;
  }

@@ -3441,13 +3442,16 @@ static const struct amdgpu_irq_src_funcs dce_v6_0_hpd_irq_funcs = { static void dce_v6_0_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 = &dce_v6_0_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 = &dce_v6_0_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 = &dce_v6_0_hpd_irq_funcs;
  }

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

index 9cf14b8b2db9..c008dc030687 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2664,7 +2664,6 @@ static int dce_v8_0_early_init(void *handle)
        adev->audio_endpt_wreg = &dce_v8_0_audio_endpt_wreg;

dce_v8_0_set_display_funcs(adev);

-       dce_v8_0_set_irq_funcs(adev);

adev->mode_info.num_crtc = dce_v8_0_get_num_crtc(adev); @@ -2688,6 +2687,8 @@ static int dce_v8_0_early_init(void *handle)

                return -EINVAL;
        }

+ dce_v8_0_set_irq_funcs(adev);

+
        return 0;
  }

@@ -3525,13 +3526,16 @@ static const struct amdgpu_irq_src_funcs dce_v8_0_hpd_irq_funcs = { static void dce_v8_0_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 = &dce_v8_0_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 = &dce_v8_0_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 = &dce_v8_0_hpd_irq_funcs;
  }

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx