amdgpu/dce: Use actual number of CRTCs and HPDs in set_irq_funcs
Subsystems (3)
PATCH 1/3 amdgpu/dce: Use actual number of CRTCs and HPDs in set_irq_funcs
From: Michel Dänzer <[email protected]>
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)
--- 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(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +8 -4
@@ -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; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +8 -4
@@ -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; }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +8 -4
@@ -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; }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +8 -4
@@ -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; }
Signature · 6 lines
2.15.0.rc1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20171026144629.9804-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
PATCH 2/3 drm/amd/display: Use real number of CRTCs and HPDs in set_irq_funcs
From: Michel Dänzer <[email protected]>
Corresponding to the previous non-DC change.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -1561,7 +1561,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 :
@@ -1635,6 +1634,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
@@ -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; }
Signature · 6 lines
2.15.0.rc1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 amdgpu: Remove AMDGPU_{HPD,CRTC_IRQ,PAGEFLIP_IRQ}_LAST
In reply to a message not in the archiveFrom: Michel Dänzer <[email protected]>
Not used anymore.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -3
@@ -89,7 +89,6 @@ enum amdgpu_hpd_id {AMDGPU_HPD_4 ,AMDGPU_HPD_5 ,AMDGPU_HPD_6 , -AMDGPU_HPD_LAST , AMDGPU_HPD_NONE = 0xff, };
@@ -106,7 +105,6 @@ enum amdgpu_crtc_irq {AMDGPU_CRTC_IRQ_VLINE4 ,AMDGPU_CRTC_IRQ_VLINE5 ,AMDGPU_CRTC_IRQ_VLINE6 , -AMDGPU_CRTC_IRQ_LAST , AMDGPU_CRTC_IRQ_NONE = 0xff };
@@ -117,7 +115,6 @@ enum amdgpu_pageflip_irq {AMDGPU_PAGEFLIP_IRQ_D4 ,AMDGPU_PAGEFLIP_IRQ_D5 ,AMDGPU_PAGEFLIP_IRQ_D6 , -AMDGPU_PAGEFLIP_IRQ_LAST , AMDGPU_PAGEFLIP_IRQ_NONE = 0xff };
Signature · 6 lines
2.15.0.rc1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20171026144629.9804-3-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/3] amdgpu: Remove AMDGPU_{HPD,CRTC_IRQ,PAGEFLIP_IRQ}_LAST
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Thursday, October 26, 2017 10:46 AM
To: [email protected]
Subject: [PATCH 3/3] amdgpu: Remove AMDGPU_{HPD,CRTC_IRQ,PAGEFLIP_IRQ}_LAST
Quoted 5 lines
From: Michel Dänzer <[email protected]>
Not used anymore.
Signed-off-by Michel Dänzer <[email protected]>
Series is:
Quoted 36 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 --- 1 file changed, 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0
-4@@ -89,7 +89,6 @@ enum amdgpu_hpd_id {AMDGPU_HPD_4 ,AMDGPU_HPD_5 ,AMDGPU_HPD_6 , -AMDGPU_HPD_LAST , AMDGPU_HPD_NONE = 0xff, };@@ -106,7 +105,6 @@ enum amdgpu_crtc_irq {AMDGPU_CRTC_IRQ_VLINE4 ,AMDGPU_CRTC_IRQ_VLINE5 ,AMDGPU_CRTC_IRQ_VLINE6 , -AMDGPU_CRTC_IRQ_LAST , AMDGPU_CRTC_IRQ_NONE = 0xff };@@ -117,7 +115,6 @@ enum amdgpu_pageflip_irq {AMDGPU_PAGEFLIP_IRQ_D4 ,AMDGPU_PAGEFLIP_IRQ_D5 ,AMDGPU_PAGEFLIP_IRQ_D6 , -AMDGPU_PAGEFLIP_IRQ_LAST , AMDGPU_PAGEFLIP_IRQ_NONE = 0xff }; --2.15.0.rc1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byAm 26.10.2017 um 16:46 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
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 <[email protected]>
Quoted 161 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +8
-4@@ -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; }drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +8
-4@@ -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; }drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +8
-4@@ -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; }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +6
-2@@ -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;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c static const struct amdgpu_irq_src_funcs dce_v8_0_hpd_irq_funcs = { · line 3541
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2
-2- 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx