drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL
Subsystems (3)
PATCH 1/4 drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL
MBUS_DBOX_B2B_TRANSACTIONS_MAX, MBUS_DBOX_B2B_TRANSACTIONS_DELAY and MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN were being programmed with zeros while specification has different default values for this registers in display 12 and newer.
While at it also converting all MBUS_DBOX macros to use REG_* macros.
BSpec: 50343
BSpec: 20231
--- drivers/gpu/drm/i915/display/intel_display.c | 13 +++++++--- drivers/gpu/drm/i915/i915_reg.h | 25 ++++++++++++-------- 2 files changed, 25 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +10 -3
@@ -1830,13 +1830,20 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc, bool joined_mbus) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -u32 val; +u32 val =0 ; + +if (DISPLAY_VER (dev_priv) >=12 ) { + val |=MBUS_DBOX_B2B_TRANSACTIONS_MAX (16 ); + val |=MBUS_DBOX_B2B_TRANSACTIONS_DELAY (1 ); + val |=MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN ; + }/* Wa_22010947358:adl-p */ if (IS_ALDERLAKE_P (dev_priv)) - val = joined_mbus ?MBUS_DBOX_A_CREDIT (6 ) :MBUS_DBOX_A_CREDIT (4 ); + val |= joined_mbus ?MBUS_DBOX_A_CREDIT (6 ) : +MBUS_DBOX_A_CREDIT (4 );else - val =MBUS_DBOX_A_CREDIT (2 ); + val |=MBUS_DBOX_A_CREDIT (2 );if (DISPLAY_VER (dev_priv) >=12 ) { val |=MBUS_DBOX_BW_CREDIT (2 );
drivers/gpu/drm/i915/i915_reg.h +15 -10
@@ -1103,16 +1103,21 @@#define MBUS_ABOX_BT_CREDIT_POOL1_MASK (0x1F << 0)#define MBUS_ABOX_BT_CREDIT_POOL1 (x) ((x) << 0) -#define _PIPEA_MBUS_DBOX_CTL 0x7003C -#define _PIPEB_MBUS_DBOX_CTL 0x7103C -#define PIPE_MBUS_DBOX_CTL (pipe) _MMIO_PIPE(pipe, _PIPEA_MBUS_DBOX_CTL, \ - _PIPEB_MBUS_DBOX_CTL) -#define MBUS_DBOX_BW_CREDIT_MASK (3 << 14) -#define MBUS_DBOX_BW_CREDIT (x) ((x) << 14) -#define MBUS_DBOX_B_CREDIT_MASK (0x1F << 8) -#define MBUS_DBOX_B_CREDIT (x) ((x) << 8) -#define MBUS_DBOX_A_CREDIT_MASK (0xF << 0) -#define MBUS_DBOX_A_CREDIT (x) ((x) << 0) +#define _PIPEA_MBUS_DBOX_CTL 0x7003C +#define _PIPEB_MBUS_DBOX_CTL 0x7103C +#define PIPE_MBUS_DBOX_CTL (pipe) _MMIO_PIPE(pipe, _PIPEA_MBUS_DBOX_CTL, \ + _PIPEB_MBUS_DBOX_CTL) +#define MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK REG_GENMASK(24, 20)/* tgl+ */ +#define MBUS_DBOX_B2B_TRANSACTIONS_MAX (x) REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_MAX_MASK, x) +#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK REG_GENMASK(19, 17)/* tgl+ */ +#define MBUS_DBOX_B2B_TRANSACTIONS_DELAY (x) REG_FIELD_PREP(MBUS_DBOX_B2B_TRANSACTIONS_DELAY_MASK, x) +#define MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN REG_BIT(16)/* tgl+ */ +#define MBUS_DBOX_BW_CREDIT_MASK REG_GENMASK(15, 14) +#define MBUS_DBOX_BW_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_BW_CREDIT_MASK, x) +#define MBUS_DBOX_B_CREDIT_MASK REG_GENMASK(12, 8) +#define MBUS_DBOX_B_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_B_CREDIT_MASK, x) +#define MBUS_DBOX_A_CREDIT_MASK REG_GENMASK(3, 0) +#define MBUS_DBOX_A_CREDIT (x) REG_FIELD_PREP(MBUS_DBOX_A_CREDIT_MASK, x)#define MBUS_UBOX_CTL _MMIO(0x4503C)#define MBUS_BBOX_CTL_S1 _MMIO(0x45040)
Signature · 1 line
2.35.1
PATCH 2/4 drm/i915/display/adlp: Adjust MBUS DBOX BW and B credits
From: Caz Yokoyama <[email protected]>
Alderlake-P has different MBUS DBOX BW and B credits than other platforms, so here setting it properly.
BSpec: 49213
BSpec: 50343
--- drivers/gpu/drm/i915/display/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +4 -1
@@ -1845,7 +1845,10 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc, bool joined_mbus)else val |=MBUS_DBOX_A_CREDIT (2 ); -if (DISPLAY_VER (dev_priv) >=12 ) { +if (IS_ALDERLAKE_P (dev_priv)) { + val |=MBUS_DBOX_BW_CREDIT (2 ); + val |=MBUS_DBOX_B_CREDIT (8 ); + }else if (DISPLAY_VER (dev_priv) >=12 ) { val |=MBUS_DBOX_BW_CREDIT (2 ); val |=MBUS_DBOX_B_CREDIT (12 ); }else {
Signature · 1 line
2.35.1
PATCH 3/4 drm/i915/display: Add HAS_MBUS_JOINING
In reply to José Roberto de SouzaThis will make easy to extend MBUS joining support to future platforms that also supports this feature.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_pm.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1387,6 +1387,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_D12_PLANE_MINIMIZATION (dev_priv) (IS_ROCKETLAKE(dev_priv) || \ IS_ALDERLAKE_S(dev_priv)) +#define HAS_MBUS_JOINING (i915) (IS_ALDERLAKE_P(i915)) +/* i915_gem.c */ void i915_gem_init_early (struct drm_i915_private *dev_priv);void i915_gem_cleanup_early (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -6038,7 +6038,7 @@ skl_compute_ddb(struct intel_atomic_state *state)return ret; } -if (IS_ALDERLAKE_P (dev_priv)) +if (HAS_MBUS_JOINING (dev_priv)) new_dbuf_state->joined_mbus =adlp_check_mbus_joined (new_dbuf_state->active_pipes);
@@ -6530,7 +6530,7 @@ void skl_wm_get_hw_state(struct drm_i915_private *dev_priv)to_intel_dbuf_state (dev_priv->dbuf.obj.state);struct intel_crtc *crtc; -if (IS_ALDERLAKE_P (dev_priv)) +if (HAS_MBUS_JOINING (dev_priv)) dbuf_state->joined_mbus =intel_de_read (dev_priv,MBUS_CTL ) &MBUS_JOIN ;for_each_intel_crtc (&dev_priv->drm, crtc) {
@@ -8192,7 +8192,7 @@ static void update_mbus_pre_enable(struct intel_atomic_state *state)const struct intel_dbuf_state *dbuf_state =intel_atomic_get_new_dbuf_state (state); -if (!IS_ALDERLAKE_P (dev_priv)) +if (!HAS_MBUS_JOINING (dev_priv))return ;/*
Signature · 1 line
2.35.1
PATCH 4/4 drm/i915/display/adlp: Fix programing of PIPE_MBUS_DBOX_CTL
In reply to José Roberto de SouzaPIPE_MBUS_DBOX_CTL was only being programmed when a pipe is being enabled but that could potentially cause issues as it could have mismatching values while pipes are being enabled.
So here moving the PIPE_MBUS_DBOX_CTL programming of all pipes to be executed before the function that enables all pipes, leaving all pipes with a matching A_CREDIT value.
While at it, also moving it to intel_pm.c as we are trying to reduce the gigantic size of intel_display.c and intel_pm.c have other MBUS programing sequences.
v2:
- do not program PIPE_MBUS_DBOX_CTL if pipe will not be active or when it do not needs modeset
- remove the checks to wait a vblank
v3:
- checking if dbuf state is present in state before using it
v4:
- removing redundant checks
- calling intel_atomic_get_new_dbuf_state instead of intel_atomic_get_dbuf_state
BSpec: 49213
BSpec: 50343
--- drivers/gpu/drm/i915/display/intel_display.c | 41 +-------------- drivers/gpu/drm/i915/intel_pm.c | 52 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_pm.h | 1 + 3 files changed, 54 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -40
@@ -1826,39 +1826,6 @@ static void glk_pipe_scaler_clock_gating_wa(struct drm_i915_private *dev_priv,intel_de_write (dev_priv,CLKGATE_DIS_PSL (pipe), val); } -static void icl_pipe_mbus_enable (struct intel_crtc *crtc,bool joined_mbus) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum pipe pipe = crtc->pipe; -u32 val =0 ; - -if (DISPLAY_VER (dev_priv) >=12 ) { - val |=MBUS_DBOX_B2B_TRANSACTIONS_MAX (16 ); - val |=MBUS_DBOX_B2B_TRANSACTIONS_DELAY (1 ); - val |=MBUS_DBOX_REGULATE_B2B_TRANSACTIONS_EN ; - } - -/* Wa_22010947358:adl-p */ -if (IS_ALDERLAKE_P (dev_priv)) - val |= joined_mbus ?MBUS_DBOX_A_CREDIT (6 ) : -MBUS_DBOX_A_CREDIT (4 ); -else - val |=MBUS_DBOX_A_CREDIT (2 ); - -if (IS_ALDERLAKE_P (dev_priv)) { - val |=MBUS_DBOX_BW_CREDIT (2 ); - val |=MBUS_DBOX_B_CREDIT (8 ); - }else if (DISPLAY_VER (dev_priv) >=12 ) { - val |=MBUS_DBOX_BW_CREDIT (2 ); - val |=MBUS_DBOX_B_CREDIT (12 ); - }else { - val |=MBUS_DBOX_BW_CREDIT (1 ); - val |=MBUS_DBOX_B_CREDIT (8 ); - } - -intel_de_write (dev_priv,PIPE_MBUS_DBOX_CTL (pipe), val); -} -static void hsw_set_linetime_wm (const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);
@@ -1995,13 +1962,6 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,intel_initial_watermarks (state, crtc); -if (DISPLAY_VER (dev_priv) >=11 ) { -const struct intel_dbuf_state *dbuf_state = -intel_atomic_get_new_dbuf_state (state); - -icl_pipe_mbus_enable (crtc, dbuf_state->joined_mbus); - } -if (intel_crtc_is_bigjoiner_slave (new_crtc_state))intel_crtc_vblank_on (new_crtc_state);
@@ -8600,6 +8560,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)intel_encoders_update_prepare (state);intel_dbuf_pre_plane_update (state); +intel_mbus_dbox_update (state);for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) {if (new_crtc_state->do_async_flip)
drivers/gpu/drm/i915/intel_pm.c +52 -0
55 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.h +1 -0
@@ -94,5 +94,6 @@ intel_atomic_get_dbuf_state(struct intel_atomic_state *state);int intel_dbuf_init (struct drm_i915_private *dev_priv);void intel_dbuf_pre_plane_update (struct intel_atomic_state *state);void intel_dbuf_post_plane_update (struct intel_atomic_state *state); +void intel_mbus_dbox_update (struct intel_atomic_state *state);#endif /* __INTEL_PM_H__ */
Signature · 1 line
2.35.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [CI,1/4] drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [CI,1/4] drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL
URL : https://patchwork.freedesktop.org/series/101961/
State : failure
== Summary ==
Applying: drm/i915/display/tgl+: Set default values for all registers in PIPE_MBUS_DBOX_CTL
Applying: drm/i915/display/adlp: Adjust MBUS DBOX BW and B credits
Applying: drm/i915/display: Add HAS_MBUS_JOINING
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915/display: Add HAS_MBUS_JOINING
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".