Skip to content

Commit

Permalink
drm/i915/display: Add own counter for Panel Replay vblank workaround
Browse files Browse the repository at this point in the history
We are about to change meaning of vblank_enabled to fix Panel Replay vblank
workaround. For sake of clarity we need to rename it. Vblank_enabled is
used for i915gm/i945gm vblank irq workaround as well -> instead of rename
add new counter named as vblank_wa_pipes.

v2:
  - s/vblank_wa_pipes/vblank_wa_num_pipes/
  - use int as a type for the counter

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241009134225.1322820-1-jouni.hogander@intel.com
  • Loading branch information
Jouni Högander committed Oct 15, 2024
1 parent 4e75c3e commit 54ab6d1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/display/intel_display_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ struct intel_display {
/* For i915gm/i945gm vblank irq workaround */
u8 vblank_enabled;

int vblank_wa_num_pipes;

struct work_struct vblank_dc_work;

u32 de_irq_mask[I915_MAX_PIPES];
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/i915/display/intel_display_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -1424,15 +1424,15 @@ static void intel_display_vblank_dc_work(struct work_struct *work)
struct intel_display *display =
container_of(work, typeof(*display), irq.vblank_dc_work);
struct drm_i915_private *i915 = to_i915(display->drm);
u8 vblank_enabled = READ_ONCE(display->irq.vblank_enabled);
int vblank_wa_num_pipes = READ_ONCE(display->irq.vblank_wa_num_pipes);

/*
* NOTE: intel_display_power_set_target_dc_state is used only by PSR
* code for DC3CO handling. DC3CO target state is currently disabled in
* PSR code. If DC3CO is taken into use we need take that into account
* here as well.
*/
intel_display_power_set_target_dc_state(i915, vblank_enabled ? DC_STATE_DISABLE :
intel_display_power_set_target_dc_state(i915, vblank_wa_num_pipes ? DC_STATE_DISABLE :
DC_STATE_EN_UPTO_DC6);
}

Expand All @@ -1447,7 +1447,7 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)
if (gen11_dsi_configure_te(crtc, true))
return 0;

if (display->irq.vblank_enabled++ == 0 && crtc->block_dc_for_vblank)
if (display->irq.vblank_wa_num_pipes++ == 0 && crtc->block_dc_for_vblank)
schedule_work(&display->irq.vblank_dc_work);

spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
Expand Down Expand Up @@ -1478,7 +1478,7 @@ void bdw_disable_vblank(struct drm_crtc *_crtc)
bdw_disable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK);
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);

if (--display->irq.vblank_enabled == 0 && crtc->block_dc_for_vblank)
if (--display->irq.vblank_wa_num_pipes == 0 && crtc->block_dc_for_vblank)
schedule_work(&display->irq.vblank_dc_work);
}

Expand Down

0 comments on commit 54ab6d1

Please sign in to comment.