Commit 4936458b authored by Hamza Mahfooz's avatar Hamza Mahfooz Committed by Alex Deucher
Browse files

drm/amd/display: don't call dc_interrupt_set() for disabled crtcs 



As made mention of in commit 4ea7fc09 ("drm/amd/display: Do not
program interrupt status on disabled crtc"), we shouldn't program
disabled crtcs. So, filter out disabled crtcs in dm_set_vupdate_irq()
and dm_set_vblank().

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Fixes: 589d2739 ("drm/amd/display: Use crtc enable/disable_vblank hooks")
Fixes: d2574c33 ("drm/amd/display: In VRR mode, do DRM core vblank handling at end of vblank. (v2)")
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8e08e2d5

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

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable) 
	struct amdgpu_device *adev = drm_to_adev(crtc->dev);

	int rc;



	if (acrtc->otg_inst == -1)

		return 0;



	irq_source = IRQ_TYPE_VUPDATE + acrtc->otg_inst;



	rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;
@@ -151,6 +154,9 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) 
	struct vblank_control_work *work;

	int rc = 0;



	if (acrtc->otg_inst == -1)

		goto skip;



	if (enable) {

		/* vblank irq on -> Only need vupdate irq in vrr mode */

		if (amdgpu_dm_vrr_active(acrtc_state))
@@ -168,6 +174,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) 
	if (!dc_interrupt_set(adev->dm.dc, irq_source, enable))

		return -EBUSY;



skip:

	if (amdgpu_in_reset(adev))

		return 0;