Skip to content

Commit 23af4d2

Browse files
Alex Hunggregkh
authored andcommitted
drm/amd/display: Remove unnecessary amdgpu_irq_get/put
commit 5009628 upstream. [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] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 42ef932 commit 23af4d2

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
@@ -8393,16 +8393,6 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
83938393
struct amdgpu_crtc *acrtc,
83948394
struct dm_crtc_state *acrtc_state)
83958395
{
8396-
/*
8397-
* We have no guarantee that the frontend index maps to the same
8398-
* backend index - some even map to more than one.
8399-
*
8400-
* TODO: Use a different interrupt or check DC itself for the mapping.
8401-
*/
8402-
int irq_type =
8403-
amdgpu_display_crtc_idx_to_irq_type(
8404-
adev,
8405-
acrtc->crtc_id);
84068396
struct drm_vblank_crtc_config config = {0};
84078397
struct dc_crtc_timing *timing;
84088398
int offdelay;
@@ -8428,28 +8418,7 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
84288418

84298419
drm_crtc_vblank_on_config(&acrtc->base,
84308420
&config);
8431-
8432-
amdgpu_irq_get(
8433-
adev,
8434-
&adev->pageflip_irq,
8435-
irq_type);
8436-
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
8437-
amdgpu_irq_get(
8438-
adev,
8439-
&adev->vline0_irq,
8440-
irq_type);
8441-
#endif
84428421
} else {
8443-
#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
8444-
amdgpu_irq_put(
8445-
adev,
8446-
&adev->vline0_irq,
8447-
irq_type);
8448-
#endif
8449-
amdgpu_irq_put(
8450-
adev,
8451-
&adev->pageflip_irq,
8452-
irq_type);
84538422
drm_crtc_vblank_off(&acrtc->base);
84548423
}
84558424
}

0 commit comments

Comments
 (0)