From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>
Subject: [PATCH v3 06/13] drm/i915/psr: Block PKG C-State when enabling PSR
Date: Mon, 14 Apr 2025 13:05:01 +0300 [thread overview]
Message-ID: <20250414100508.1208774-7-jouni.hogander@intel.com> (raw)
In-Reply-To: <20250414100508.1208774-1-jouni.hogander@intel.com>
Block PKG C-State when enabling PSR when enabling PSR as described in
workaround for underrun on idle PSR HW issue (Wa_16025596647).
v2: use intel_dmc_block_pkgc instead of directly writing dmc register
Bspec: 74151
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
---
drivers/gpu/drm/i915/display/intel_psr.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 20d53292c3b3..44adee087350 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -38,6 +38,7 @@
#include "intel_display_irq.h"
#include "intel_display_rpm.h"
#include "intel_display_types.h"
+#include "intel_dmc.h"
#include "intel_dp.h"
#include "intel_dp_aux.h"
#include "intel_frontbuffer.h"
@@ -1951,6 +1952,12 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,
intel_de_rmw(display, CLKGATE_DIS_MISC, 0,
CLKGATE_DIS_MISC_DMASC_GATING_DIS);
}
+
+ /* Wa_16025596647 */
+ if ((DISPLAY_VER(display) == 20 ||
+ IS_DISPLAY_VERx100_STEP(display, 3000, STEP_A0, STEP_B0)) &&
+ !intel_dp->psr.panel_replay_enabled)
+ intel_dmc_block_pkgc(display, intel_dp->psr.pipe, true);
}
static bool psr_interrupt_error_check(struct intel_dp *intel_dp)
@@ -2175,6 +2182,12 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
DP_RECEIVER_ALPM_CONFIG, 0);
}
+ /* Wa_16025596647 */
+ if ((DISPLAY_VER(display) == 20 ||
+ IS_DISPLAY_VERx100_STEP(display, 3000, STEP_A0, STEP_B0)) &&
+ !intel_dp->psr.panel_replay_enabled)
+ intel_dmc_block_pkgc(display, intel_dp->psr.pipe, false);
+
intel_dp->psr.enabled = false;
intel_dp->psr.panel_replay_enabled = false;
intel_dp->psr.sel_update_enabled = false;
--
2.43.0
next prev parent reply other threads:[~2025-04-14 10:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 10:04 [PATCH v3 00/13] Underrun on idle PSR workaround Jouni Högander
2025-04-14 10:04 ` [PATCH v3 01/13] drm/i915/display: Add new interface for getting dc_state Jouni Högander
2025-04-22 8:27 ` Kahola, Mika
2025-04-14 10:04 ` [PATCH v3 02/13] drm/i915/psr: Store enabled non-psr pipes into intel_crtc_state Jouni Högander
2025-04-22 7:49 ` Kahola, Mika
2025-04-14 10:04 ` [PATCH v3 03/13] drm/i915/dmc: Add PIPEDMC_EVT_CTL register definition Jouni Högander
2025-04-22 8:26 ` Kahola, Mika
2025-04-14 10:04 ` [PATCH v3 04/13] drm/i915/dmc: Add PIPEDMC_BLOCK_PKGC_SW definitions Jouni Högander
2025-04-14 10:05 ` [PATCH v3 05/13] drm/i915/dmc: Add interface to block PKG C-state Jouni Högander
2025-04-22 8:28 ` Kahola, Mika
2025-04-23 9:54 ` Hogander, Jouni
2025-04-14 10:05 ` Jouni Högander [this message]
2025-04-22 9:38 ` [PATCH v3 06/13] drm/i915/psr: Block PKG C-State when enabling PSR Kahola, Mika
2025-04-14 10:05 ` [PATCH v3 07/13] drm/i915/psr: Add mechanism to notify PSR of pipe enable/disable Jouni Högander
2025-04-14 10:05 ` [PATCH v3 08/13] drm/i915/psr: Add mechanism to notify PSR of DC5/6 enable disable Jouni Högander
2025-04-14 10:05 ` [PATCH v3 09/13] drm/i915/psr: Add interface to notify PSR of vblank enable/disable Jouni Högander
2025-04-14 10:05 ` [PATCH v3 10/13] drm/i915/dmc: Add interface to control start of PKG C-state exit Jouni Högander
2025-04-22 10:08 ` Kahola, Mika
2025-05-12 10:57 ` Ville Syrjälä
2025-05-12 11:24 ` Hogander, Jouni
2025-04-14 10:05 ` [PATCH v3 11/13] drm/i915/psr: Apply underrun on PSR idle workaround Jouni Högander
2025-04-22 10:16 ` Kahola, Mika
2025-04-14 10:05 ` [PATCH v3 12/13] drm/i915/display: Rename intel_psr_needs_block_dc_vblank Jouni Högander
2025-04-14 10:05 ` [PATCH v3 13/13] drm/i915/display: Rename vblank DC workaround functions and variables Jouni Högander
2025-04-14 11:08 ` ✓ CI.Patch_applied: success for Underrun on idle PSR workaround (rev6) Patchwork
2025-04-14 11:09 ` ✗ CI.checkpatch: warning " Patchwork
2025-04-14 11:10 ` ✓ CI.KUnit: success " Patchwork
2025-04-14 11:19 ` ✓ CI.Build: " Patchwork
2025-04-14 11:21 ` ✓ CI.Hooks: " Patchwork
2025-04-14 11:24 ` ✗ CI.checksparse: warning " Patchwork
2025-04-14 12:09 ` ✓ Xe.CI.BAT: success " Patchwork
2025-04-14 14:37 ` ✗ Xe.CI.Full: failure " Patchwork
2025-04-23 9:04 ` Hogander, Jouni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250414100508.1208774-7-jouni.hogander@intel.com \
--to=jouni.hogander@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox