Attachment 145843 Details for Bug 112051 – Fix PCH type detection again

[patch] Fix PCH type detection again

0001-drm-i915-Fix-detection-for-a-CMP-V-PCH.patch (text/plain), 2.18 KB, created by Imre Deak on 2019-10-30 16:34:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2019-10-30 16:34:36 UTC

Size: 2.18 KB

patch

obsolete

>From b5a93bf91ed15936a23b8bd4d22103e120839d2d Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Wed, 30 Oct 2019 18:05:48 +0200
>Subject: [PATCH] drm/i915: Fix detection for a CMP-V PCH
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/intel_pch.c | 6 +++++-
> drivers/gpu/drm/i915/intel_pch.h | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
>index 000ba43e2c02..8fd92b9130a7 100644
>--- a/drivers/gpu/drm/i915/intel_pch.c
>+++ b/drivers/gpu/drm/i915/intel_pch.c
>@@ -62,7 +62,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
> 		/* KBP is SPT compatible */
> 		return PCH_SPT;
> 	case INTEL_PCH_CNP_DEVICE_ID_TYPE:
>-	case INTEL_PCH_CNP2_DEVICE_ID_TYPE:
> 		DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
> 		WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
> 		return PCH_CNP;
>@@ -76,6 +75,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id)
> 		WARN_ON(!IS_COFFEELAKE(dev_priv));
> 		/* CometPoint is CNP Compatible */
> 		return PCH_CNP;
>+	case INTEL_PCH_CMP_V_DEVICE_ID_TYPE:
>+		DRM_DEBUG_KMS("Found Comet Lake V PCH (CMP-V)\n");
>+		WARN_ON(!IS_COFFEELAKE(dev_priv));
>+		/* Comet Lake V PCH is based on KBP, which is SPT compatible */
>+		return PCH_SPT;
> 	case INTEL_PCH_ICP_DEVICE_ID_TYPE:
> 		DRM_DEBUG_KMS("Found Ice Lake PCH\n");
> 		WARN_ON(!IS_ICELAKE(dev_priv));
>diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h
>index 1115c6a0522c..d26c25dd8d54 100644
>--- a/drivers/gpu/drm/i915/intel_pch.h
>+++ b/drivers/gpu/drm/i915/intel_pch.h
>@@ -40,10 +40,10 @@ enum intel_pch {
> #define INTEL_PCH_SPT_LP_DEVICE_ID_TYPE		0x9D00
> #define INTEL_PCH_KBP_DEVICE_ID_TYPE		0xA280
> #define INTEL_PCH_CNP_DEVICE_ID_TYPE		0xA300
>-#define INTEL_PCH_CNP2_DEVICE_ID_TYPE		0xA380
> #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_CMP_V_DEVICE_ID_TYPE		0xA380
> #define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480
> #define INTEL_PCH_MCC_DEVICE_ID_TYPE		0x4B00
> #define INTEL_PCH_TGP_DEVICE_ID_TYPE		0xA080
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 112051: 145771 | 145772 | 145783 | 145786 | 145790 | 145804 | 145805 | 145836 | 145843 | 145844 | 145845 | 145846 | 145847

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.