On Mon, 2019-03-04 at 15:50 -0800, Rodrigo Vivi wrote: > On Mon, Mar 04, 2019 at 03:06:05PM -0800, Anusha wrote: > > From: Anusha Srivatsa <anusha.sriva...@intel.com> > > > > Comet Lake PCH is based off of Cannon Point(CNP). > > Add PCI ID for Comet Lake PCH. > > > > Cc: Rodrigo Vivi <rodrigo.v...@intel.com> > > Cc: Lucas De Marchi <lucas.demar...@intel.com> > > Signed-off-by: Anusha Srivatsa <anusha.sriva...@intel.com> > > Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com> > > > --- > > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > > 2 files changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > > b/drivers/gpu/drm/i915/i915_drv.c > > index 1b2f5a6f8c25..7934f19ed250 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -186,6 +186,8 @@ intel_pch_type(const struct drm_i915_private > > *dev_priv, unsigned short id) > > return PCH_CNP; > > case INTEL_PCH_CNP_LP_DEVICE_ID_TYPE: > > DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n"); > > + case INTEL_PCH_CMP_DEVICE_ID_TYPE: > > + DRM_DEBUG_KMS("Found Comet Lake LP PCH (CMP)\n"); This will end up printing both debug messages for CNP-LP devices.
> > WARN_ON(!IS_CANNONLAKE(dev_priv) && > > !IS_COFFEELAKE(dev_priv)); > > return PCH_CNP; > > case INTEL_PCH_ICP_DEVICE_ID_TYPE: > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > > b/drivers/gpu/drm/i915/i915_drv.h > > index 453af7438e67..55298e19e740 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -530,7 +530,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 */ > > }; > > @@ -2552,6 +2552,7 @@ static inline unsigned int > > i915_sg_segment_size(void) > > #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 > > -- > > 2.21.0 > > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx