drm/i915: Fix PCH names for KBP and CNP.

No functional change.

KBP was based on SPT and spec wasn't clear about the full name.
There was the initial point of the "Point" confusion.

Later the split with Coffee Lake and Cannon Lake both using CNP
and also some uncertainty from the specs we had at that time
made us to propagated the mistake along.

So, let's fix this now and avoid propagating these wrong
"points".

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170731185220.758-1-rodrigo.vivi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index cc25115c2db75b62239cb91d931b60ea6bddae8f..ba15844cbafc3b10a862e39c4f2877076476838b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv)
                                        !IS_KABYLAKE(dev_priv));
                        } else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) {
                                dev_priv->pch_type = PCH_KBP;
-                               DRM_DEBUG_KMS("Found KabyPoint PCH\n");
+                               DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
                                WARN_ON(!IS_SKYLAKE(dev_priv) &&
                                        !IS_KABYLAKE(dev_priv));
                        } else if (id == INTEL_PCH_CNP_DEVICE_ID_TYPE) {
                                dev_priv->pch_type = PCH_CNP;
-                               DRM_DEBUG_KMS("Found CannonPoint PCH\n");
+                               DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
                                WARN_ON(!IS_CANNONLAKE(dev_priv) &&
                                        !IS_COFFEELAKE(dev_priv));
                        } else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
                                dev_priv->pch_type = PCH_CNP;
-                               DRM_DEBUG_KMS("Found CannonPoint LP PCH\n");
+                               DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
                                WARN_ON(!IS_CANNONLAKE(dev_priv) &&
                                        !IS_COFFEELAKE(dev_priv));
                        } else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 39ac2dd49ac96bd4fc3c485b5abed30a34b4562a..907603cba447f2c0bfc2f65ff85d89595e1dcd1b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1166,8 +1166,8 @@ enum intel_pch {
        PCH_CPT,        /* Cougarpoint/Pantherpoint PCH */
        PCH_LPT,        /* Lynxpoint/Wildcatpoint PCH */
        PCH_SPT,        /* Sunrisepoint PCH */
-       PCH_KBP,        /* Kabypoint PCH */
-       PCH_CNP,        /* Cannonpoint PCH */
+       PCH_KBP,        /* Kaby Lake PCH */
+       PCH_CNP,        /* Cannon Lake PCH */
        PCH_NOP,
 };