From: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: hariom.pandey@intel.com
Subject: [Intel-gfx] [PATCH V2] drm/i915/jsl: Disable cursor clock gating in HDR mode
Date: Mon, 2 Nov 2020 13:09:46 +0530 [thread overview]
Message-ID: <20201102073946.158633-1-tejaskumarx.surendrakumar.upadhyay@intel.com> (raw)
Display underrun in HDR mode when cursor is enabled.
RTL fix will be implemented CLKGATE_DIS_PSL_A bit 28-46520h.
As per W/A 1604331009, Disable cursor clock gating in HDR mode.
Bspec : 33451
Changes since V1:
- Modified way CLKGATE_DIS_PSL bit 28 was modified
Cc: Souza Jose <jose.souza@intel.com>
Signed-off-by: Tejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 28 ++++++++++++++++++++
drivers/gpu/drm/i915/i915_reg.h | 5 ++++
2 files changed, 33 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cddbda5303ff..b132585d9e78 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -541,6 +541,15 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe,
intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~DPFR_GATING_DIS);
}
+/* Wa_1604331009:jsl */
+static void
+jsl_wa_cursorclkgating(struct drm_i915_private *dev_priv, enum pipe pipe,
+ bool enable)
+{
+ intel_de_rmw(dev_priv, CLKGATE_DIS_PSL(pipe),
+ CURSOR_GATING_DIS, enable ? CURSOR_GATING_DIS : 0);
+}
+
static bool
needs_modeset(const struct intel_crtc_state *state)
{
@@ -6637,6 +6646,16 @@ static bool needs_scalerclk_wa(const struct intel_crtc_state *crtc_state)
return false;
}
+static bool needs_cursorclk_wa(const struct intel_crtc_state *crtc_state)
+{
+ struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
+ /* Wa_1604331009:jsl */
+ if (crtc_state->active_planes & icl_hdr_plane_mask() &&
+ IS_GEN(dev_priv, 11))
+ return true;
+ return false;
+}
+
static bool planes_enabling(const struct intel_crtc_state *old_crtc_state,
const struct intel_crtc_state *new_crtc_state)
{
@@ -6678,6 +6697,10 @@ static void intel_post_plane_update(struct intel_atomic_state *state,
if (needs_scalerclk_wa(old_crtc_state) &&
!needs_scalerclk_wa(new_crtc_state))
icl_wa_scalerclkgating(dev_priv, pipe, false);
+
+ if (needs_cursorclk_wa(old_crtc_state) &&
+ !needs_cursorclk_wa(new_crtc_state))
+ jsl_wa_cursorclkgating(dev_priv, pipe, false);
}
static void skl_disable_async_flip_wa(struct intel_atomic_state *state,
@@ -6743,6 +6766,11 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,
needs_scalerclk_wa(new_crtc_state))
icl_wa_scalerclkgating(dev_priv, pipe, true);
+ /* Wa_1604331009:jsl */
+ if (!needs_cursorclk_wa(old_crtc_state) &&
+ needs_cursorclk_wa(new_crtc_state))
+ jsl_wa_cursorclkgating(dev_priv, pipe, true);
+
/*
* Vblank time updates from the shadow to live plane control register
* are blocked if the memory self-refresh mode is active at that
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index bb0656875697..f81a503c5d4b 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4194,6 +4194,11 @@ enum {
#define INF_UNIT_LEVEL_CLKGATE _MMIO(0x9560)
#define CGPSF_CLKGATE_DIS (1 << 3)
+/*
+ * GEN11 clock gating regs
+ */
+#define CURSOR_GATING_DIS BIT(28)
+
/*
* Display engine regs
*/
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2020-11-02 7:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 7:39 Tejas Upadhyay [this message]
2020-11-02 8:21 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/jsl: Disable cursor clock gating in HDR mode (rev2) Patchwork
2020-11-02 9:33 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-03 0:01 ` [Intel-gfx] [PATCH V2] drm/i915/jsl: Disable cursor clock gating in HDR mode Souza, Jose
2020-11-30 15:50 ` Surendrakumar Upadhyay, TejaskumarX
2021-02-04 16:14 ` Surendrakumar Upadhyay, TejaskumarX
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=20201102073946.158633-1-tejaskumarx.surendrakumar.upadhyay@intel.com \
--to=tejaskumarx.surendrakumar.upadhyay@intel.com \
--cc=hariom.pandey@intel.com \
--cc=intel-gfx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.