diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-09 13:35:20 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-09 21:50:05 +0200 |
| commit | 803ec96319eec2897d3828e87bd38180295d0dcc (patch) | |
| tree | 52d984ce67727626985bdbd7507e60017e3af82c | |
| parent | edbb9242478d3aed8b4d3cb197032e9ded26b3e7 (diff) | |
drm/i915: Move vblank waits out from IPS code
Hoist the IPS related vblank waits one level up. Later on we'll
want to consolidate all the potential pre-plane update vblank
waits into one so we can't be hiding any in low level code.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209113526.7595-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 19 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.h | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index c880edca7911..e1f47e7bf44c 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -752,8 +752,9 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc, crtc_state->data_rate[plane->id] = 0; crtc_state->min_cdclk[plane->id] = 0; - if (plane->id == PLANE_PRIMARY) - hsw_disable_ips(crtc_state); + if (plane->id == PLANE_PRIMARY && + hsw_disable_ips(crtc_state)) + intel_crtc_wait_for_next_vblank(crtc); /* * Vblank time updates from the shadow to live plane control register @@ -1127,14 +1128,15 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state) } } -void hsw_disable_ips(const struct intel_crtc_state *crtc_state) +bool hsw_disable_ips(const struct intel_crtc_state *crtc_state) { struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); + bool need_vblank_wait = false; if (!crtc_state->ips_enabled) - return; + return need_vblank_wait; if (IS_BROADWELL(dev_priv)) { drm_WARN_ON(dev, @@ -1153,7 +1155,9 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state) } /* We need to wait for a vblank before we can disable the plane. */ - intel_crtc_wait_for_next_vblank(crtc); + need_vblank_wait = true; + + return need_vblank_wait; } static void intel_crtc_dpms_overlay_disable(struct intel_crtc *crtc) @@ -1426,8 +1430,9 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, intel_psr_pre_plane_update(state, crtc); - if (hsw_pre_update_disable_ips(old_crtc_state, new_crtc_state)) - hsw_disable_ips(old_crtc_state); + if (hsw_pre_update_disable_ips(old_crtc_state, new_crtc_state) && + hsw_disable_ips(old_crtc_state)) + intel_crtc_wait_for_next_vblank(crtc); if (intel_fbc_pre_update(state, crtc)) intel_crtc_wait_for_next_vblank(crtc); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 457738aeee3e..8f9bec36898e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -634,7 +634,7 @@ void i9xx_crtc_clock_get(struct intel_crtc *crtc, int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state); void hsw_enable_ips(const struct intel_crtc_state *crtc_state); -void hsw_disable_ips(const struct intel_crtc_state *crtc_state); +bool hsw_disable_ips(const struct intel_crtc_state *crtc_state); enum intel_display_power_domain intel_port_to_power_domain(enum port port); enum intel_display_power_domain intel_aux_power_domain(struct intel_digital_port *dig_port); |