On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote: > It seems in the past we have BDW with PCH not been propperly identified > and we force it to be LPT and we were warning !IS_HASWELL on propper identification. > > Now that products are out there we are receiveing logs with this incorrect WARN. > And also according to local tests on all production BDW here ULT or HALO we don't > need this force anymore. So let's clean this block for real. > > v2: Fix LPT_LP WARNs to avoid wrong warns on BDW_ULT (By Jani). > > Reference: https://bugs.freedesktop.org/attachment.cgi?id=110972 > > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > Cc: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > Cc: Xion Zhang <xiong.y.zhang@xxxxxxxxx> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Pushed to drm-intel-fixes with cc: stable, thanks for the patch. BR, Jani. > --- > drivers/gpu/drm/i915/i915_drv.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 6484229..66c72bd 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -462,19 +462,13 @@ void intel_detect_pch(struct drm_device *dev) > } else if (id == INTEL_PCH_LPT_DEVICE_ID_TYPE) { > dev_priv->pch_type = PCH_LPT; > DRM_DEBUG_KMS("Found LynxPoint PCH\n"); > - WARN_ON(!IS_HASWELL(dev)); > - WARN_ON(IS_HSW_ULT(dev)); > - } else if (IS_BROADWELL(dev)) { > - dev_priv->pch_type = PCH_LPT; > - dev_priv->pch_id = > - INTEL_PCH_LPT_LP_DEVICE_ID_TYPE; > - DRM_DEBUG_KMS("This is Broadwell, assuming " > - "LynxPoint LP PCH\n"); > + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev)); > + WARN_ON(IS_HSW_ULT(dev) || IS_BDW_ULT(dev)); > } else if (id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) { > dev_priv->pch_type = PCH_LPT; > DRM_DEBUG_KMS("Found LynxPoint LP PCH\n"); > - WARN_ON(!IS_HASWELL(dev)); > - WARN_ON(!IS_HSW_ULT(dev)); > + WARN_ON(!IS_HASWELL(dev) && !IS_BROADWELL(dev)); > + WARN_ON(!IS_HSW_ULT(dev) && !IS_BDW_ULT(dev)); > } else if (id == INTEL_PCH_SPT_DEVICE_ID_TYPE) { > dev_priv->pch_type = PCH_SPT; > DRM_DEBUG_KMS("Found SunrisePoint PCH\n"); > -- > 2.1.0 > -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
