drm/i915/cnl: Cannonlake uses CNP PCH.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 6 Jun 2017 20:30:31 +0000 (13:30 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Wed, 7 Jun 2017 14:28:14 +0000 (07:28 -0700)
Avoid warning when CNP is detected with CNL.

Also let's force it on the virtual detection.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1496781040-20888-2-git-send-email-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/i915_drv.c

index 6ca99dea7cf07a9a3a418aec2d036d0f8b5ee205..7a925c51477f792770502b8b5736f31e3186c42a 100644 (file)
@@ -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;
@@ -222,9 +224,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) &&