Skip to content

Commit d4bc181

Browse files
committed
drm/i915/display/adl_p: Correctly program MBUS DBOX A credits
Alderlake-P have different values for MBUS DBOX A credits depending if MBUS join is enabled or not. BSpec: 50343 BSpec: 54369 Cc: Matt Atwood <[email protected]> Signed-off-by: José Roberto de Souza <[email protected]> Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 233624e commit d4bc181

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3442,13 +3442,17 @@ static void glk_pipe_scaler_clock_gating_wa(struct drm_i915_private *dev_priv,
34423442
intel_de_write(dev_priv, CLKGATE_DIS_PSL(pipe), val);
34433443
}
34443444

3445-
static void icl_pipe_mbus_enable(struct intel_crtc *crtc)
3445+
static void icl_pipe_mbus_enable(struct intel_crtc *crtc, bool joined_mbus)
34463446
{
34473447
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
34483448
enum pipe pipe = crtc->pipe;
34493449
u32 val;
34503450

3451-
val = MBUS_DBOX_A_CREDIT(2);
3451+
/* Wa_22010947358:adl-p */
3452+
if (IS_ALDERLAKE_P(dev_priv))
3453+
val = joined_mbus ? MBUS_DBOX_A_CREDIT(6) : MBUS_DBOX_A_CREDIT(4);
3454+
else
3455+
val = MBUS_DBOX_A_CREDIT(2);
34523456

34533457
if (DISPLAY_VER(dev_priv) >= 12) {
34543458
val |= MBUS_DBOX_BW_CREDIT(2);
@@ -3604,8 +3608,12 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
36043608
if (dev_priv->display.initial_watermarks)
36053609
dev_priv->display.initial_watermarks(state, crtc);
36063610

3607-
if (DISPLAY_VER(dev_priv) >= 11)
3608-
icl_pipe_mbus_enable(crtc);
3611+
if (DISPLAY_VER(dev_priv) >= 11) {
3612+
const struct intel_dbuf_state *dbuf_state =
3613+
intel_atomic_get_new_dbuf_state(state);
3614+
3615+
icl_pipe_mbus_enable(crtc, dbuf_state->joined_mbus);
3616+
}
36093617

36103618
if (new_crtc_state->bigjoiner_slave)
36113619
intel_crtc_vblank_on(new_crtc_state);

0 commit comments

Comments
 (0)