Merge tag 'rpmsg-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_crtc.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index 64dd029702926f70c32b5fd370d9c3ca8ef5bccd..dc4f37240beb4c3a61bfd77386ac548c14be0ebe 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@ -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;
@@ -105,8 +108,7 @@ static void vblank_control_worker(struct work_struct *work)
        else if (dm->active_vblank_irq_count)
                dm->active_vblank_irq_count--;
 
-       dc_allow_idle_optimizations(
-               dm->dc, dm->active_vblank_irq_count == 0 ? true : false);
+       dc_allow_idle_optimizations(dm->dc, dm->active_vblank_irq_count == 0);
 
        DRM_DEBUG_KMS("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);
 
@@ -127,6 +129,9 @@ static void vblank_control_worker(struct work_struct *work)
                                amdgpu_dm_psr_disable(vblank_work->stream);
                } else if (vblank_work->stream->link->psr_settings.psr_feature_enabled &&
                           !vblank_work->stream->link->psr_settings.psr_allow_active &&
+#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
+                          !amdgpu_dm_crc_window_is_activated(&vblank_work->acrtc->base) &&
+#endif
                           vblank_work->acrtc->dm_irq_params.allow_psr_entry) {
                        amdgpu_dm_psr_enable(vblank_work->stream);
                }
@@ -149,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))
@@ -166,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;