| Message ID | 20200603211529.3005059-4-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remaining RKL patches | expand |
On Wed, Jun 03, 2020 at 02:15:17PM -0700, Matt Roper wrote: > Although RKL is a gen12 platform, it doesn't have the two extra > instances of the ABOX control register; we should only program > the single MBUS_ABOX_CTL on this platform. > > Bspec: 50096 > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index 2c1ce50b572b..37847b3d733c 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > @@ -4772,7 +4772,7 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv) > MBUS_ABOX_BW_CREDIT(1); > > intel_de_rmw(dev_priv, MBUS_ABOX_CTL, mask, val); > - if (INTEL_GEN(dev_priv) >= 12) { > + if (INTEL_GEN(dev_priv) >= 12 && !IS_ROCKETLAKE(dev_priv)) { > intel_de_rmw(dev_priv, MBUS_ABOX1_CTL, mask, val); > intel_de_rmw(dev_priv, MBUS_ABOX2_CTL, mask, val); > } Can't find anyting definitive in bspec, so not 100% sure but since you say it gives unclaim reg errors it seems correct. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Though I think I'd like to see that HAS_ABOX() thing I suggested and use it here as well. > -- > 2.24.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index 2c1ce50b572b..37847b3d733c 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -4772,7 +4772,7 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv) MBUS_ABOX_BW_CREDIT(1); intel_de_rmw(dev_priv, MBUS_ABOX_CTL, mask, val); - if (INTEL_GEN(dev_priv) >= 12) { + if (INTEL_GEN(dev_priv) >= 12 && !IS_ROCKETLAKE(dev_priv)) { intel_de_rmw(dev_priv, MBUS_ABOX1_CTL, mask, val); intel_de_rmw(dev_priv, MBUS_ABOX2_CTL, mask, val); }
Although RKL is a gen12 platform, it doesn't have the two extra instances of the ABOX control register; we should only program the single MBUS_ABOX_CTL on this platform. Bspec: 50096 Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)