On Wed, Jul 27, 2022 at 06:34:16PM -0700, Radhakrishna Sripada wrote: > From: José Roberto de Souza <jose.souza@xxxxxxxxx> > > Display version 14 also supports MBUS joining just like ADL-P > and also it don't need MBUS initialization, so extending ADL-P s/don't/doesn't/ Otherwise, Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> > code paths to display version 14 and higher. > > Bspec: 49213 > > Signed-off-by: José Roberto de Souza <jose.souza@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index ccc3f78b1607..c0bc5c30cef3 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -1101,7 +1101,7 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv) > unsigned long abox_regs = INTEL_INFO(dev_priv)->display.abox_mask; > u32 mask, val, i; > > - if (IS_ALDERLAKE_P(dev_priv)) > + if (IS_ALDERLAKE_P(dev_priv) || DISPLAY_VER(dev_priv) >= 14) > return; > > mask = MBUS_ABOX_BT_CREDIT_POOL1_MASK | > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 5767bbba2260..6a876cd53228 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1360,7 +1360,7 @@ 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)) > +#define HAS_MBUS_JOINING(i915) (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) > > #define HAS_3D_PIPELINE(i915) (INTEL_INFO(i915)->has_3d_pipeline) > > -- > 2.25.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation
