* [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes
@ 2023-03-22 10:21 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 1/5] drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006 Jouni Högander
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:21 UTC (permalink / raw)
To: intel-gfx
Fix/adjust Wa_16013835468 and implement Wa_14015648006. Implement Wa_1136 and
check for vblank being long enough for psr2.
v4:
- Keep/fix Wa_16013835468
- Use calculated block count number instead of fixed 12
v3:
- apply Wa_16013835468 for icl as well
- set/clear chicken bit in post plane update
- Unify pre/post hooks
v2: Implement Wa_1136
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Cc: Mika Kahola <mika.kahola@intel.com>
Jouni Högander (5):
drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006
drm/i915/psr: Implement Wa_14015648006
drm/i915/psr: Add helpers for block count number handling
drm/i915/psr: Check that vblank is long enough for psr2
drm/i915/psr: Implement Display WA #1136
.../drm/i915/display/intel_display_types.h | 1 +
drivers/gpu/drm/i915/display/intel_psr.c | 95 +++++++++++++++----
drivers/gpu/drm/i915/display/skl_watermark.c | 6 +-
3 files changed, 80 insertions(+), 22 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH v4 1/5] drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
@ 2023-03-22 10:22 ` Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 2/5] drm/i915/psr: Implement Wa_14015648006 Jouni Högander
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:22 UTC (permalink / raw)
To: intel-gfx
Wa_16013835468 is a separate from Wa_14015648006 and needs to be
applied for TGL onwards. Fix this by removing all the references to
Wa_14015648006 and apply Wa_16013835468 according to Bspec.
Also move workaround into separate function as a preparation for
Wa_14015648006 implementation. Apply this workaround in post plane
hook.
Bspec: 55378
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 45 ++++++++++++++++--------
1 file changed, 30 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 8dbf452d63c2..e66677e0554b 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1173,18 +1173,6 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
intel_dp->psr.psr2_sel_fetch_enabled ?
IGNORE_PSR2_HW_TRACKING : 0);
- /*
- * Wa_16013835468
- * Wa_14015648006
- */
- if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
- IS_DISPLAY_VER(dev_priv, 12, 13)) {
- if (crtc_state->hw.adjusted_mode.crtc_vblank_start !=
- crtc_state->hw.adjusted_mode.crtc_vdisplay)
- intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0,
- wa_16013835468_bit_get(intel_dp));
- }
-
if (intel_dp->psr.psr2_enabled) {
if (DISPLAY_VER(dev_priv) == 9)
intel_de_rmw(dev_priv, CHICKEN_TRANS(cpu_transcoder), 0,
@@ -1359,10 +1347,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
/*
* Wa_16013835468
- * Wa_14015648006
*/
- if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
- IS_DISPLAY_VER(dev_priv, 12, 13))
+ if (DISPLAY_VER(dev_priv) >= 12)
intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1,
wa_16013835468_bit_get(intel_dp), 0);
@@ -1941,6 +1927,30 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
}
}
+/*
+ * Wa_16013835468
+ */
+static void wm_optimization_wa(struct intel_dp *intel_dp,
+ const struct intel_crtc_state *crtc_state)
+{
+ struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+ bool set_wa_bit = false;
+
+ /* Wa_16013835468 */
+ if (DISPLAY_VER(dev_priv) >= 12)
+ set_wa_bit |= crtc_state->hw.adjusted_mode.crtc_vblank_start !=
+ crtc_state->hw.adjusted_mode.crtc_vdisplay;
+
+ set_wa_bit &= intel_dp->psr.enabled;
+
+ if (set_wa_bit)
+ intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0,
+ wa_16013835468_bit_get(intel_dp));
+ else
+ intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1,
+ wa_16013835468_bit_get(intel_dp), 0);
+}
+
static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state)
{
@@ -1966,6 +1976,11 @@ static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,
if (!psr->enabled && !keep_disabled)
intel_psr_enable_locked(intel_dp, crtc_state);
+ /*
+ * Wa_16013835468
+ */
+ wm_optimization_wa(intel_dp, crtc_state);
+
/* Force a PSR exit when enabling CRC to avoid CRC timeouts */
if (crtc_state->crc_enabled && psr->enabled)
psr_force_hw_tracking_exit(intel_dp);
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH v4 2/5] drm/i915/psr: Implement Wa_14015648006
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 1/5] drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006 Jouni Högander
@ 2023-03-22 10:22 ` Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 3/5] drm/i915/psr: Add helpers for block count number handling Jouni Högander
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:22 UTC (permalink / raw)
To: intel-gfx
PSR WM optimization should be disabled based on any wm level being
disabled. Also same WA should be applied for ICL as well.
Bspec: 71580
v3
- Split patch
v2
- set/clear chicken bit in post_plane_update
- apply for ICL as well
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_types.h | 1 +
drivers/gpu/drm/i915/display/intel_psr.c | 10 +++++++++-
drivers/gpu/drm/i915/display/skl_watermark.c | 7 +++++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index c32bfba06ca1..60504c390408 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1152,6 +1152,7 @@ struct intel_crtc_state {
bool has_psr2;
bool enable_psr2_sel_fetch;
bool req_psr2_sdp_prior_scanline;
+ bool wm_level_disabled;
u32 dc3co_exitline;
u16 su_y_granularity;
struct drm_dp_vsc_sdp psr_vsc;
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index e66677e0554b..dfac546d983b 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1347,8 +1347,9 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
/*
* Wa_16013835468
+ * Wa_14015648006
*/
- if (DISPLAY_VER(dev_priv) >= 12)
+ if (DISPLAY_VER(dev_priv) >= 11)
intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1,
wa_16013835468_bit_get(intel_dp), 0);
@@ -1929,6 +1930,7 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
/*
* Wa_16013835468
+ * Wa_14015648006
*/
static void wm_optimization_wa(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)
@@ -1936,6 +1938,11 @@ static void wm_optimization_wa(struct intel_dp *intel_dp,
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
bool set_wa_bit = false;
+ /* Wa_14015648006 */
+ if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
+ IS_DISPLAY_VER(dev_priv, 11, 13))
+ set_wa_bit |= crtc_state->wm_level_disabled;
+
/* Wa_16013835468 */
if (DISPLAY_VER(dev_priv) >= 12)
set_wa_bit |= crtc_state->hw.adjusted_mode.crtc_vblank_start !=
@@ -1978,6 +1985,7 @@ static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,
/*
* Wa_16013835468
+ * Wa_14015648006
*/
wm_optimization_wa(intel_dp, crtc_state);
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 50a9a6adbe32..afb751c024ba 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -2273,9 +2273,12 @@ static int skl_wm_check_vblank(struct intel_crtc_state *crtc_state)
return level;
/*
- * FIXME PSR needs to toggle LATENCY_REPORTING_REMOVED_PIPE_*
+ * PSR needs to toggle LATENCY_REPORTING_REMOVED_PIPE_*
* based on whether we're limited by the vblank duration.
- *
+ */
+ crtc_state->wm_level_disabled = level < i915->display.wm.num_levels - 1;
+
+ /*
* FIXME also related to skl+ w/a 1136 (also unimplemented as of
* now) perhaps?
*/
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH v4 3/5] drm/i915/psr: Add helpers for block count number handling
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 1/5] drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 2/5] drm/i915/psr: Implement Wa_14015648006 Jouni Högander
@ 2023-03-22 10:22 ` Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 4/5] drm/i915/psr: Check that vblank is long enough for psr2 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 5/5] drm/i915/psr: Implement Display WA #1136 Jouni Högander
4 siblings, 0 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:22 UTC (permalink / raw)
To: intel-gfx
Add helpers to make it more clear how PSR2_CTL[Block Count Number]
is configured.
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index dfac546d983b..4b7c946a9a25 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -519,6 +519,17 @@ static u32 intel_psr2_get_tp_time(struct intel_dp *intel_dp)
return val;
}
+static int psr2_block_count_lines(struct intel_dp *intel_dp)
+{
+ return intel_dp->psr.io_wake_lines < 9 &&
+ intel_dp->psr.fast_wake_lines < 9 ? 8 : 12;
+}
+
+static int psr2_block_count(struct intel_dp *intel_dp)
+{
+ return psr2_block_count_lines(intel_dp) / 4;
+}
+
static void hsw_activate_psr2(struct intel_dp *intel_dp)
{
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
@@ -536,11 +547,10 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)
val |= intel_psr2_get_tp_time(intel_dp);
if (DISPLAY_VER(dev_priv) >= 12) {
- if (intel_dp->psr.io_wake_lines < 9 &&
- intel_dp->psr.fast_wake_lines < 9)
- val |= TGL_EDP_PSR2_BLOCK_COUNT_NUM_2;
- else
+ if (psr2_block_count(intel_dp) > 2)
val |= TGL_EDP_PSR2_BLOCK_COUNT_NUM_3;
+ else
+ val |= TGL_EDP_PSR2_BLOCK_COUNT_NUM_2;
}
/* Wa_22012278275:adl-p */
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH v4 4/5] drm/i915/psr: Check that vblank is long enough for psr2
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
` (2 preceding siblings ...)
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 3/5] drm/i915/psr: Add helpers for block count number handling Jouni Högander
@ 2023-03-22 10:22 ` Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 5/5] drm/i915/psr: Implement Display WA #1136 Jouni Högander
4 siblings, 0 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:22 UTC (permalink / raw)
To: intel-gfx
Ensure vblank >= psr2 vblank
where
Psr2 vblank = PSR2_CTL Block Count Number maximum line count.
Bspec: 71580, 49274
v2: Use calculated block count number maximum line count
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 4b7c946a9a25..b53c71c06105 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -968,6 +968,15 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
return false;
}
+ /* Vblank >= PSR2_CTL Block Count Number maximum line count */
+ if (crtc_state->hw.adjusted_mode.crtc_vblank_end -
+ crtc_state->hw.adjusted_mode.crtc_vblank_start <
+ psr2_block_count_lines(intel_dp)) {
+ drm_dbg_kms(&dev_priv->drm,
+ "PSR2 not enabled, too short vblank time\n");
+ return false;
+ }
+
if (HAS_PSR2_SEL_FETCH(dev_priv)) {
if (!intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) &&
!HAS_PSR_HW_TRACKING(dev_priv)) {
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [PATCH v4 5/5] drm/i915/psr: Implement Display WA #1136
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
` (3 preceding siblings ...)
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 4/5] drm/i915/psr: Check that vblank is long enough for psr2 Jouni Högander
@ 2023-03-22 10:22 ` Jouni Högander
4 siblings, 0 replies; 6+ messages in thread
From: Jouni Högander @ 2023-03-22 10:22 UTC (permalink / raw)
To: intel-gfx
Implement Display WA #1136 for SKL/BXT.
Bspec: 21664
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 17 +++++++++++++++++
drivers/gpu/drm/i915/display/skl_watermark.c | 5 -----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index b53c71c06105..24c3f75bb9d8 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1950,6 +1950,7 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state,
/*
* Wa_16013835468
* Wa_14015648006
+ * Display WA #1136: skl, bxt
*/
static void wm_optimization_wa(struct intel_dp *intel_dp,
const struct intel_crtc_state *crtc_state)
@@ -1957,6 +1958,17 @@ static void wm_optimization_wa(struct intel_dp *intel_dp,
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
bool set_wa_bit = false;
+ /*
+ * Display WA #1136: skl, bxt
+ * skl/bxt do not have chicken bit: disable PSR
+ */
+ if (DISPLAY_VER(dev_priv) <= 9) {
+ if (crtc_state->wm_level_disabled &&
+ intel_dp->psr.enabled)
+ intel_psr_disable_locked(intel_dp);
+ return;
+ }
+
/* Wa_14015648006 */
if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) ||
IS_DISPLAY_VER(dev_priv, 11, 13))
@@ -1999,12 +2011,17 @@ static void _intel_psr_post_plane_update(const struct intel_atomic_state *state,
keep_disabled |= psr->sink_not_reliable;
keep_disabled |= !crtc_state->active_planes;
+ /* Display WA #1136: skl, bxt */
+ keep_disabled |= DISPLAY_VER(dev_priv) <= 9 &&
+ crtc_state->wm_level_disabled;
+
if (!psr->enabled && !keep_disabled)
intel_psr_enable_locked(intel_dp, crtc_state);
/*
* Wa_16013835468
* Wa_14015648006
+ * Display WA #1136: skl, bxt
*/
wm_optimization_wa(intel_dp, crtc_state);
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index afb751c024ba..ced61da8b496 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -2278,11 +2278,6 @@ static int skl_wm_check_vblank(struct intel_crtc_state *crtc_state)
*/
crtc_state->wm_level_disabled = level < i915->display.wm.num_levels - 1;
- /*
- * FIXME also related to skl+ w/a 1136 (also unimplemented as of
- * now) perhaps?
- */
-
for (level++; level < i915->display.wm.num_levels; level++) {
enum plane_id plane_id;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-03-22 10:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-22 10:21 [Intel-gfx] [PATCH v4 0/5] High refresh rate PSR fixes Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 1/5] drm/i915/psr: Modify/fix Wa_16013835468 and prepare for Wa_14015648006 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 2/5] drm/i915/psr: Implement Wa_14015648006 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 3/5] drm/i915/psr: Add helpers for block count number handling Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 4/5] drm/i915/psr: Check that vblank is long enough for psr2 Jouni Högander
2023-03-22 10:22 ` [Intel-gfx] [PATCH v4 5/5] drm/i915/psr: Implement Display WA #1136 Jouni Högander
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).