From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 07/13] drm/i915: Extract intel_dbuf_mbus_join_update()
Date: Wed, 27 Mar 2024 19:45:38 +0200 [thread overview]
Message-ID: <20240327174544.983-8-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20240327174544.983-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Extact the stuff that writes the joining bits in MBUS_CTL
into its own function. Will help with correctly sequencing
the operations done during mbus programming.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/skl_watermark.c | 37 +++++++++++++-------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 6bd3fec0aa56..f7e03078bd43 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -3653,21 +3653,12 @@ void intel_dbuf_mdclk_cdclk_ratio_update(struct drm_i915_private *i915, u8 ratio
DBUF_MIN_TRACKER_STATE_SERVICE(ratio - 1));
}
-/*
- * Configure MBUS_CTL and all DBUF_CTL_S of each slice to join_mbus state before
- * update the request state of all DBUS slices.
- */
-static void update_mbus_pre_enable(struct intel_atomic_state *state)
+static void intel_dbuf_mbus_join_update(struct intel_atomic_state *state)
{
struct drm_i915_private *i915 = to_i915(state->base.dev);
+ const struct intel_dbuf_state *new_dbuf_state =
+ intel_atomic_get_new_dbuf_state(state);
u32 mbus_ctl;
- const struct intel_dbuf_state *old_dbuf_state =
- intel_atomic_get_old_dbuf_state(state);
- const struct intel_dbuf_state *new_dbuf_state =
- intel_atomic_get_new_dbuf_state(state);
-
- if (!HAS_MBUS_JOINING(i915))
- return;
/*
* TODO: Implement vblank synchronized MBUS joining changes.
@@ -3683,6 +3674,28 @@ static void update_mbus_pre_enable(struct intel_atomic_state *state)
intel_de_rmw(i915, MBUS_CTL,
MBUS_HASHING_MODE_MASK | MBUS_JOIN |
MBUS_JOIN_PIPE_SELECT_MASK, mbus_ctl);
+}
+
+/*
+ * Configure MBUS_CTL and all DBUF_CTL_S of each slice to join_mbus state before
+ * update the request state of all DBUS slices.
+ */
+static void update_mbus_pre_enable(struct intel_atomic_state *state)
+{
+ struct drm_i915_private *i915 = to_i915(state->base.dev);
+ const struct intel_dbuf_state *old_dbuf_state =
+ intel_atomic_get_old_dbuf_state(state);
+ const struct intel_dbuf_state *new_dbuf_state =
+ intel_atomic_get_new_dbuf_state(state);
+
+ if (!HAS_MBUS_JOINING(i915))
+ return;
+
+ /*
+ * TODO: Implement vblank synchronized MBUS joining changes.
+ * Must be properly coordinated with dbuf reprogramming.
+ */
+ intel_dbuf_mbus_join_update(state);
if (DISPLAY_VER(i915) >= 20 &&
old_dbuf_state->mdclk_cdclk_ratio != new_dbuf_state->mdclk_cdclk_ratio) {
--
2.43.2
next prev parent reply other threads:[~2024-03-27 17:46 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-27 17:45 [PATCH 00/13] drm/i915: Implemnt vblank sycnhronized mbus joining changes Ville Syrjala
2024-03-27 17:45 ` [PATCH 01/13] drm/i915/cdclk: Fix CDCLK programming order when pipes are active Ville Syrjala
2024-03-28 9:16 ` Murthy, Arun R
2024-03-28 12:32 ` Ville Syrjälä
2024-03-28 11:35 ` Shankar, Uma
2024-03-29 15:29 ` Gustavo Sousa
2024-04-03 15:51 ` Ville Syrjälä
2024-03-27 17:45 ` [PATCH 02/13] drm/i915/cdclk: Fix voltage_level programming edge case Ville Syrjala
2024-03-28 11:40 ` Shankar, Uma
2024-03-29 17:04 ` Gustavo Sousa
2024-04-02 14:56 ` Ville Syrjälä
2024-03-27 17:45 ` [PATCH 03/13] drm/i915/cdclk: Drop tgl/dg2 cdclk bump hacks Ville Syrjala
2024-03-28 11:48 ` Shankar, Uma
2024-03-27 17:45 ` [PATCH 04/13] drm/i915/cdclk: Indicate whether CDCLK change happens during pre or post plane update Ville Syrjala
2024-03-28 11:51 ` Shankar, Uma
2024-03-29 17:14 ` Gustavo Sousa
2024-03-27 17:45 ` [PATCH 05/13] drm/i915: Loop over all active pipes in intel_mbus_dbox_update Ville Syrjala
2024-03-28 11:53 ` Shankar, Uma
2024-03-27 17:45 ` [PATCH 06/13] drm/i915: Relocate intel_mbus_dbox_update() Ville Syrjala
2024-03-28 11:54 ` Shankar, Uma
2024-03-29 18:28 ` Gustavo Sousa
2024-03-27 17:45 ` Ville Syrjala [this message]
2024-03-28 11:57 ` [PATCH 07/13] drm/i915: Extract intel_dbuf_mbus_join_update() Shankar, Uma
2024-03-29 18:29 ` Gustavo Sousa
2024-03-27 17:45 ` [PATCH 08/13] drm/i915: Extract intel_dbuf_mdclk_min_tracker_update() Ville Syrjala
2024-03-28 12:01 ` Shankar, Uma
2024-03-29 18:31 ` Gustavo Sousa
2024-03-27 17:45 ` [PATCH 09/13] drm/i915: Add debugs for mbus joining and dbuf ratio programming Ville Syrjala
2024-03-28 12:04 ` Shankar, Uma
2024-03-29 18:32 ` Gustavo Sousa
2024-03-27 17:45 ` [PATCH 10/13] drm/i915: Use old mbus_join value when increasing CDCLK Ville Syrjala
2024-03-28 12:07 ` Shankar, Uma
2024-03-27 17:45 ` [PATCH 11/13] drm/i915: Implement vblank synchronized MBUS join changes Ville Syrjala
2024-03-28 16:08 ` Shankar, Uma
2024-03-29 18:15 ` Gustavo Sousa
2024-04-02 14:25 ` Ville Syrjälä
2024-03-27 17:45 ` [PATCH 12/13] drm/i915: Use a plain old int for the cdclk/mdclk ratio Ville Syrjala
2024-03-28 16:09 ` Shankar, Uma
2024-03-29 18:23 ` Gustavo Sousa
2024-04-02 14:49 ` Ville Syrjälä
2024-03-27 17:45 ` [PATCH 13/13] drm/i915: Optimize out redundant dbuf slice updates Ville Syrjala
2024-03-28 16:12 ` Shankar, Uma
2024-03-27 22:44 ` ✗ Fi.CI.SPARSE: warning for drm/i915: Implemnt vblank sycnhronized mbus joining changes Patchwork
2024-03-28 14:50 ` ✓ Fi.CI.BAT: success " Patchwork
2024-03-28 15:58 ` Patchwork
2024-03-28 16:15 ` ✓ Fi.CI.IGT: " Patchwork
2024-03-28 16:16 ` [PATCH 00/13] " Shankar, Uma
2024-03-28 18:35 ` ✓ Fi.CI.IGT: success for " Patchwork
2024-03-28 20:30 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-03-29 4:42 ` ✗ Fi.CI.SPARSE: warning for drm/i915: Implemnt vblank sycnhronized mbus joining changes (rev2) Patchwork
2024-03-29 5:00 ` ✓ Fi.CI.BAT: success " Patchwork
2024-03-30 2:41 ` ✓ Fi.CI.IGT: " Patchwork
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=20240327174544.983-8-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.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.