drm/i915/display: Rename intel_psr_needs_block_dc_vblank

Scope of intel_psr_needs_block_dc_vblank has changed now. Rename it as
intel_psr_needs_vblank_notification. Also rename
intel_crtc::block_dc_for_vblank as intel_crtc:vblank_psr_notify

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Link: https://lore.kernel.org/r/20250414100508.1208774-13-jouni.hogander@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 5b2603ef2ff75e4a16f0e94d10d33c984b0b18d0..bdf30ab9639679ce73b202a46fa2bf510ddb262e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -124,7 +124,7 @@ void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
 
-       crtc->block_dc_for_vblank = intel_psr_needs_block_dc_vblank(crtc_state);
+       crtc->vblank_psr_notify = intel_psr_needs_vblank_notification(crtc_state);
 
        assert_vblank_disabled(&crtc->base);
        drm_crtc_set_max_vblank_count(&crtc->base,
@@ -154,7 +154,7 @@ void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state)
        drm_crtc_vblank_off(&crtc->base);
        assert_vblank_disabled(&crtc->base);
 
-       crtc->block_dc_for_vblank = false;
+       crtc->vblank_psr_notify = false;
 
        flush_work(&display->irq.vblank_dc_work);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index ab1d96924494734cfd72218a076ecffc65c769d7..716ff35e2f5caa64a97bb7cee31a5f993c42e600 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1718,7 +1718,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
        if (gen11_dsi_configure_te(crtc, true))
                return 0;
 
-       if (crtc->block_dc_for_vblank && display->irq.vblank_wa_num_pipes++ == 0)
+       if (crtc->vblank_psr_notify && display->irq.vblank_wa_num_pipes++ == 0)
                schedule_work(&display->irq.vblank_dc_work);
 
        spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
@@ -1749,7 +1749,7 @@ void bdw_disable_vblank(struct drm_crtc *_crtc)
        bdw_disable_pipe_irq(display, pipe, GEN8_PIPE_VBLANK);
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 
-       if (crtc->block_dc_for_vblank && --display->irq.vblank_wa_num_pipes == 0)
+       if (crtc->vblank_psr_notify && --display->irq.vblank_wa_num_pipes == 0)
                schedule_work(&display->irq.vblank_dc_work);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 0e2945aa60579e46e3d24656a5587171c70dfcd3..ee84c1215e54bce0385c9a8980b16bdd0fc125b8 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1440,7 +1440,7 @@ struct intel_crtc {
        struct intel_pipe_crc pipe_crc;
 #endif
 
-       bool block_dc_for_vblank;
+       bool vblank_psr_notify;
 };
 
 struct intel_plane_error {

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index ae60a9d346cdb0f8341d975a26ab31450c86ea39..127eec4272fda96c694fa379e163233fabaca375 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2325,15 +2325,17 @@ out:
 }
 
 /**
- * intel_psr_needs_block_dc_vblank - Check if block dc entry is needed
+ * intel_psr_needs_vblank_notification - Check if PSR need vblank enable/disable
+ * notification.
  * @crtc_state: CRTC status
  *
  * We need to block DC6 entry in case of Panel Replay as enabling VBI doesn't
  * prevent it in case of Panel Replay. Panel Replay switches main link off on
  * DC entry. This means vblank interrupts are not fired and is a problem if
- * user-space is polling for vblank events.
+ * user-space is polling for vblank events. Also Wa_16025596647 needs
+ * information when vblank is enabled/disabled.
  */
-bool intel_psr_needs_block_dc_vblank(const struct intel_crtc_state *crtc_state)
+bool intel_psr_needs_vblank_notification(const struct intel_crtc_state *crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
        struct intel_display *display = to_intel_display(crtc_state);

diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
index a914b7ee3756a2c838c867560a9e0b931e29bc0b..c61384bb7382abae00eb6c570dda1fe1ce4b1d7a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.h
+++ b/drivers/gpu/drm/i915/display/intel_psr.h
@@ -59,7 +59,7 @@ void intel_psr2_program_trans_man_trk_ctl(struct intel_dsb *dsb,
                                          const struct intel_crtc_state *crtc_state);
 void intel_psr_pause(struct intel_dp *intel_dp);
 void intel_psr_resume(struct intel_dp *intel_dp);
-bool intel_psr_needs_block_dc_vblank(const struct intel_crtc_state *crtc_state);
+bool intel_psr_needs_vblank_notification(const struct intel_crtc_state *crtc_state);
 void intel_psr_notify_pipe_change(struct intel_atomic_state *state,
                                  struct intel_crtc *crtc, bool enable);
 void intel_psr_notify_dc5_dc6(struct intel_display *display);