Skip to content

Commit 5009628

Browse files
Alex Hungalexdeucher
authored andcommitted
drm/amd/display: Remove unnecessary amdgpu_irq_get/put
[WHY & HOW] commit 7fb363c ("drm/amd/display: Let drm_crtc_vblank_on/off manage interrupts") lets drm_crtc_vblank_* to manage interrupts in amdgpu_dm_crtc_set_vblank, and amdgpu_irq_get/put do not need to be called here. Part of that patch got lost somehow, so fix it up. Fixes: 7fb363c ("drm/amd/display: Let drm_crtc_vblank_on/off manage interrupts") Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Leo Li <[email protected]> Signed-off-by: Alex Hung <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 3782305) Cc: [email protected]
1 parent 273b3eb commit 5009628

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8400,16 +8400,6 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
84008400
struct amdgpu_crtc *acrtc,
84018401
struct dm_crtc_state *acrtc_state)
84028402
{
8403-
/*
8404-
* We have no guarantee that the frontend index maps to the same
8405-
* backend index - some even map to more than one.
8406-
*
8407-
* TODO: Use a different interrupt or check DC itself for the mapping.
8408-
*/
8409-
int irq_type =
8410-
amdgpu_display_crtc_idx_to_irq_type(
8411-
adev,
8412-
acrtc->crtc_id);
84138403
struct drm_vblank_crtc_config config = {0};
84148404
struct dc_crtc_timing *timing;
84158405
int offdelay;
@@ -8435,28 +8425,7 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
84358425

84368426
drm_crtc_vblank_on_config(&acrtc->base,
84378427
&config);
8438-
8439-
amdgpu_irq_get(
8440-
adev,
8441-
&adev->pageflip_irq,
8442-
irq_type);
8443-
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
8444-
amdgpu_irq_get(
8445-
adev,
8446-
&adev->vline0_irq,
8447-
irq_type);
8448-
#endif
84498428
} else {
8450-
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
8451-
amdgpu_irq_put(
8452-
adev,
8453-
&adev->vline0_irq,
8454-
irq_type);
8455-
#endif
8456-
amdgpu_irq_put(
8457-
adev,
8458-
&adev->pageflip_irq,
8459-
irq_type);
84608429
drm_crtc_vblank_off(&acrtc->base);
84618430
}
84628431
}

0 commit comments

Comments
 (0)