[PATCH 8/8] wip: drm/i915/psr: Set idle frames to maximum while getting pipe CRC
José Roberto de Souza
jose.souza at intel.com
Thu Feb 28 23:56:16 UTC 2019
There is some sporadic CRC mismatches when PSR is enabled, increasing
the idle frames to the maximum will delay hardware to enter in
power-savings modes probably fixing the issue.
Let's see what CI says about.
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_psr.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 453af7438e67..e336f758e481 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -521,6 +521,7 @@ struct i915_psr {
bool sink_not_reliable;
bool irq_aux_error;
u16 su_x_granularity;
+ bool crc_enabled;
};
enum intel_pch {
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index e43053dc1003..8f57d92ae2a3 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -449,6 +449,14 @@ static void hsw_activate_psr1(struct intel_dp *intel_dp)
* frames, we'll go with 9 frames for now
*/
idle_frames = max(idle_frames, dev_priv->psr.sink_sync_latency + 1);
+
+ /*
+ * Set idle frames to maximum while userspace is getting CRC to avoid
+ * mismatches.
+ */
+ if (dev_priv->psr.crc_enabled)
+ idle_frames = 0xf;
+
val |= idle_frames << EDP_PSR_IDLE_FRAME_SHIFT;
val |= max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT;
@@ -720,6 +728,7 @@ static void intel_psr_enable_locked(struct drm_i915_private *dev_priv,
dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv, crtc_state);
dev_priv->psr.busy_frontbuffer_bits = 0;
dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)->pipe;
+ dev_priv->psr.crc_enabled = crtc_state->crc_enabled;
DRM_DEBUG_KMS("Enabling PSR%s\n",
dev_priv->psr.psr2_enabled ? "2" : "1");
--
2.21.0
More information about the Intel-gfx-trybot
mailing list