> -----Original Message----- > From: Intel-xe <[email protected]> On Behalf Of Jouni > Högander > Sent: Monday, 17 March 2025 10.19 > To: [email protected]; [email protected] > Cc: Hogander, Jouni <[email protected]> > Subject: [PATCH v2 11/11] drm/i915/display: Rename vblank DC workaround > functions and variables > > We have extended using vblank DC workaround mechanism for > Wa_16025596647. Rename related functions and variables: > > vblank_wa_num_pipes -> vblank_enable_count vblank_dc_work -> > vblank_notify_work intel_display_vblank_dc_work -> > intel_display_vblank_notify_work >
Reviewed-by: Mika Kahola <[email protected]> > Signed-off-by: Jouni Högander <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- > .../gpu/drm/i915/display/intel_display_core.h | 4 ++-- > .../gpu/drm/i915/display/intel_display_irq.c | 20 +++++++++---------- > 3 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c > b/drivers/gpu/drm/i915/display/intel_crtc.c > index bdf30ab963967..537859630363b 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > @@ -156,7 +156,7 @@ void intel_crtc_vblank_off(const struct intel_crtc_state > *crtc_state) > > crtc->vblank_psr_notify = false; > > - flush_work(&display->irq.vblank_dc_work); > + flush_work(&display->irq.vblank_notify_work); > } > > struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc) > diff --git > a/drivers/gpu/drm/i915/display/intel_display_core.h > b/drivers/gpu/drm/i915/display/intel_display_core.h > index 7ca1e7d710133..b24586c3753a9 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_core.h > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h > @@ -466,9 +466,9 @@ struct intel_display { > /* For i915gm/i945gm vblank irq workaround */ > u8 vblank_enabled; > > - int vblank_wa_num_pipes; > + int vblank_enable_count; > > - struct work_struct vblank_dc_work; > + struct work_struct vblank_notify_work; > > u32 de_irq_mask[I915_MAX_PIPES]; > u32 pipestat_irq_mask[I915_MAX_PIPES]; > diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c > b/drivers/gpu/drm/i915/display/intel_display_irq.c > index 833f8227da803..22942edf5ff02 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_irq.c > +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c > @@ -1722,13 +1722,13 @@ static bool gen11_dsi_configure_te(struct intel_crtc > *intel_crtc, > return true; > } > > -static void intel_display_vblank_dc_work(struct work_struct *work) > +static void intel_display_vblank_notify_work(struct work_struct *work) > { > struct intel_display *display = > - container_of(work, typeof(*display), irq.vblank_dc_work); > - int vblank_wa_num_pipes = READ_ONCE(display- > >irq.vblank_wa_num_pipes); > + container_of(work, typeof(*display), irq.vblank_notify_work); > + int vblank_enable_count = READ_ONCE(display- > >irq.vblank_enable_count); > > - intel_psr_notify_vblank_enable_disable(display, vblank_wa_num_pipes); > + intel_psr_notify_vblank_enable_disable(display, vblank_enable_count); > } > > int bdw_enable_vblank(struct drm_crtc *_crtc) @@ -1742,8 +1742,8 @@ int > bdw_enable_vblank(struct drm_crtc *_crtc) > if (gen11_dsi_configure_te(crtc, true)) > return 0; > > - if (crtc->vblank_psr_notify && display->irq.vblank_wa_num_pipes++ == > 0) > - schedule_work(&display->irq.vblank_dc_work); > + if (crtc->vblank_psr_notify && display->irq.vblank_enable_count++ == 0) > + schedule_work(&display->irq.vblank_notify_work); > > spin_lock_irqsave(&dev_priv->irq_lock, irqflags); > bdw_enable_pipe_irq(dev_priv, pipe, GEN8_PIPE_VBLANK); @@ -1773,8 > +1773,8 @@ 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 (crtc->vblank_psr_notify && --display->irq.vblank_wa_num_pipes == 0) > - schedule_work(&display->irq.vblank_dc_work); > + if (crtc->vblank_psr_notify && --display->irq.vblank_enable_count == 0) > + schedule_work(&display->irq.vblank_notify_work); > } > > static u32 vlv_dpinvgtt_pipe_fault_mask(enum pipe pipe) @@ -2345,6 +2345,6 > @@ void intel_display_irq_init(struct drm_i915_private *i915) > > intel_hotplug_irq_init(i915); > > - INIT_WORK(&i915->display.irq.vblank_dc_work, > - intel_display_vblank_dc_work); > + INIT_WORK(&i915->display.irq.vblank_notify_work, > + intel_display_vblank_notify_work); > } > -- > 2.43.0
