| From ffda5f7b606473e6dea93c754f321843346b96b4 Mon Sep 17 00:00:00 2001 |
| From: Matt Roper <matthew.d.roper@intel.com> |
| Date: Mon, 16 Sep 2019 16:32:51 -0700 |
| Subject: [PATCH] drm/i915/cml: Add second PCH ID for CMP |
| |
| commit a8064d577dab1a81222a50c2de66a2de495f14f4 upstream. |
| |
| The CMP PCH ID we have in the driver is correct for the CML-U machines we have |
| in our CI system, but the CML-S and CML-H CI machines appear to use a |
| different PCH ID, leading our driver to detect no PCH for them. |
| |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> |
| References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH") |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461 |
| Signed-off-by: Matt Roper <matthew.d.roper@intel.com> |
| Acked-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20190916233251.387-1-matthew.d.roper@intel.com |
| Fixes: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH") |
| (cherry picked from commit 8698ba53cd7173c32320ebbef4d389d41ebb5780) |
| Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c |
| index d485d49c473b..1b0410f0b38a 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.c |
| +++ b/drivers/gpu/drm/i915/i915_drv.c |
| @@ -196,6 +196,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) |
| WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); |
| return PCH_CNP; |
| case INTEL_PCH_CMP_DEVICE_ID_TYPE: |
| + case INTEL_PCH_CMP2_DEVICE_ID_TYPE: |
| DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n"); |
| WARN_ON(!IS_COFFEELAKE(dev_priv)); |
| /* CometPoint is CNP Compatible */ |
| diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h |
| index 066fd2a12851..8038b33097a9 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.h |
| +++ b/drivers/gpu/drm/i915/i915_drv.h |
| @@ -2627,6 +2627,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, |
| #define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300 |
| #define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80 |
| #define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280 |
| +#define INTEL_PCH_CMP2_DEVICE_ID_TYPE 0x0680 |
| #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480 |
| #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100 |
| #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000 |
| -- |
| 2.27.0 |
| |
