>-----Original Message----- >From: Intel-gfx [mailto:intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx] On Behalf Of >Rodrigo Vivi >Sent: Thursday, April 6, 2017 12:15 PM >To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx >Cc: Vivi, Rodrigo <rodrigo.vivi@xxxxxxxxx> >Subject: [PATCH 08/67] drm/i915/cnl: Cannonlake uses CNP PCH. > >Avoid warning when CNP is detected with CNL. > >Also let's force it on the virtual detection. Reviewed-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> >Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >--- > drivers/gpu/drm/i915/i915_drv.c | 4 ++++ > 1 file changed, 4 insertions(+) > >diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c >index 836db0d..ff4f2f9 100644 >--- a/drivers/gpu/drm/i915/i915_drv.c >+++ b/drivers/gpu/drm/i915/i915_drv.c >@@ -139,6 +139,8 @@ static enum intel_pch intel_virt_detect_pch(struct >drm_i915_private *dev_priv) > } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { > ret = PCH_SPT; > DRM_DEBUG_KMS("Assuming SunrisePoint PCH\n"); >+ } else if (IS_CANNONLAKE(dev_priv)) { >+ ret = PCH_CNP; > } > > return ret; >@@ -221,9 +223,11 @@ static void intel_detect_pch(struct drm_i915_private >*dev_priv) > } else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) { > dev_priv->pch_type = PCH_CNP; > DRM_DEBUG_KMS("Found CannonPoint >PCH\n"); >+ WARN_ON(!IS_CANNONLAKE(dev_priv)); > } else if (id_ext == >INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) { > dev_priv->pch_type = PCH_CNP; > DRM_DEBUG_KMS("Found CannonPoint LP >PCH\n"); >+ WARN_ON(!IS_CANNONLAKE(dev_priv)); > } else if ((id == INTEL_PCH_P2X_DEVICE_ID_TYPE) || > (id == INTEL_PCH_P3X_DEVICE_ID_TYPE) || > ((id == INTEL_PCH_QEMU_DEVICE_ID_TYPE) >&& >-- >1.9.1 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@xxxxxxxxxxxxxxxxxxxxx >https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
