Commit 3782305c authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

drm/amd/display: Remove unnecessary amdgpu_irq_get/put 



[WHY & HOW]
commit 7fb363c5 ("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.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 695c2c74

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

+0 −31
Original line number Diff line number Diff line
@@ -8398,16 +8398,6 @@ static void manage_dm_interrupts(struct amdgpu_device *adev, 
				 struct amdgpu_crtc *acrtc,

				 struct dm_crtc_state *acrtc_state)

{

	/*

	 * We have no guarantee that the frontend index maps to the same

	 * backend index - some even map to more than one.

	 *

	 * TODO: Use a different interrupt or check DC itself for the mapping.

	 */

	int irq_type =

		amdgpu_display_crtc_idx_to_irq_type(

			adev,

			acrtc->crtc_id);

	struct drm_vblank_crtc_config config = {0};

	struct dc_crtc_timing *timing;

	int offdelay;
@@ -8433,28 +8423,7 @@ static void manage_dm_interrupts(struct amdgpu_device *adev, 


		drm_crtc_vblank_on_config(&acrtc->base,

					  &config);



		amdgpu_irq_get(

			adev,

			&adev->pageflip_irq,

			irq_type);

#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)

		amdgpu_irq_get(

			adev,

			&adev->vline0_irq,

			irq_type);

#endif

	} else {

#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)

		amdgpu_irq_put(

			adev,

			&adev->vline0_irq,

			irq_type);

#endif

		amdgpu_irq_put(

			adev,

			&adev->pageflip_irq,

			irq_type);

		drm_crtc_vblank_off(&acrtc->base);

	}

}