pre_plane_disable and post_plane_enable handle set ips correctly,
but if there is no modeset and the ips_enabled value changes
because of force disabling for crc, or hw state readout, then we
don't toggle ips correctly. Handle this special case, which prevents
us from having to do a full modeset when collecting pipe crc.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_display.c | 8 ++++++++
drivers/gpu/drm/i915/intel_pipe_crc.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 13b372e4f06e..3af1e3f74dbb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5037,6 +5037,10 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)
(needs_modeset(&pipe_config->base) ||
!old_primary_state->base.visible))
intel_post_enable_primary(&crtc->base, pipe_config);
+ else if (pipe_config->update_pipe && pipe_config->ips_enabled &&
+ old_primary_state->base.visible && primary_state->base.visible)
+ /* IPS turned on after fastset or CRC collection disable. */
+ hsw_enable_ips(crtc, pipe_config);
}
}
@@ -5066,6 +5070,10 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,
if (old_primary_state->base.visible &&
(modeset || !primary_state->base.visible))
intel_pre_disable_primary(&crtc->base, old_crtc_state);
+ else if (pipe_config->update_pipe && !pipe_config->ips_enabled &&
+ old_primary_state->base.visible && primary_state->base.visible)
+ /* IPS turned off for CRC, disable it. */
+ hsw_disable_ips(crtc, old_crtc_state);
}
/*
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index 899839f2f7c6..cb92befc16d7 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -542,7 +542,7 @@ static void hsw_pipe_A_crc_wa(struct drm_i915_private *dev_priv,
*/
pipe_config->ips_force_disable = enable;
if (pipe_config->ips_enabled == enable)
- pipe_config->base.connectors_changed = true;
+ pipe_config->base.mode_changed = true;
}
if (IS_HASWELL(dev_priv)) {
--
2.15.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
