github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 11:33:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/display: Rename intel_psr_needs_block_dc_vblank

Browse Source 
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
This commit is contained in:
Jouni Högander 2025-04-14 13:05:07 +03:00
parent 39e4d3c2f8
commit 9df7215f4b
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_crtc.c
View File

@ -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);
}

4
drivers/gpu/drm/i915/display/intel_display_irq.c
View File

@ -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);
}

2
drivers/gpu/drm/i915/display/intel_display_types.h
View File

@ -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 {

8
drivers/gpu/drm/i915/display/intel_psr.c
View File

@ -2325,15 +2325,17 @@ void intel_psr_resume(struct intel_dp *intel_dp)
}
/**
* 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);

2
drivers/gpu/drm/i915/display/intel_psr.h
View File

@ -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);