diff options
| author |   jsg <jsg@openbsd.org> | 2019-08-24 01:43:12 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-08-24 01:43:12 +0000 |
| commit | 30ca4716515d1536e1d1e84bf632d16030100e21 (patch) | |
| tree | 5313dd0b2676bdff91fb8b3454d0d782c3ad470e | |
| parent | drm/i915/cml: Add CML PCI IDS (diff) | |
| download | wireguard-openbsd-30ca4716515d1536e1d1e84bf632d16030100e21.tar.xz wireguard-openbsd-30ca4716515d1536e1d1e84bf632d16030100e21.zip | |
drm/i915/cml: Introduce Comet Lake PCH
From Anusha Srivatsa
729ae330a0f2e270db2ca70c06a83d0aa2776288 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.c | 5 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index f0cdd46a147..c41308b3e33 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -195,6 +195,11 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); return PCH_CNP; + case INTEL_PCH_CMP_DEVICE_ID_TYPE: + DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n"); + WARN_ON(!IS_COFFEELAKE(dev_priv)); + /* CometPoint is CNP Compatible */ + return PCH_CNP; case INTEL_PCH_ICP_DEVICE_ID_TYPE: DRM_DEBUG_KMS("Found Ice Lake PCH\n"); WARN_ON(!IS_ICELAKE(dev_priv)); diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index 9c8ba12b5fa..5d1fd179a4b 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -735,7 +735,7 @@ enum intel_pch { PCH_LPT, /* Lynxpoint/Wildcatpoint PCH */ PCH_SPT, /* Sunrisepoint PCH */ PCH_KBP, /* Kaby Lake PCH */ - PCH_CNP, /* Cannon Lake PCH */ + PCH_CNP, /* Cannon/Comet Lake PCH */ PCH_ICP, /* Ice Lake PCH */ PCH_NOP, /* PCH without south display */ }; @@ -2788,6 +2788,7 @@ intel_info(const struct drm_i915_private *dev_priv) #define INTEL_PCH_KBP_DEVICE_ID_TYPE 0xA280 #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_ICP_DEVICE_ID_TYPE 0x3480 #define INTEL_PCH_P2X_DEVICE_ID_TYPE 0x7100 #define INTEL_PCH_P3X_DEVICE_ID_TYPE 0x7000 |