[Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP

[Matt Roper]

On Wed, Oct 09, 2019 at 10:03:31AM +0300, Timo Aaltonen wrote:
> On 17.9.2019 2.32, Matt Roper wrote:
> > 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 at intel.com>
> > Cc: Anusha Srivatsa <anusha.srivatsa at 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 at intel.com>

Cc: drm-intel-fixes at lists.freedesktop.org

> > ---
> >  drivers/gpu/drm/i915/intel_pch.c | 1 +
> >  drivers/gpu/drm/i915/intel_pch.h | 1 +
> >  2 files changed, 2 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
> > index fa864d8f2b73..15f8bff141f9 100644
> > --- a/drivers/gpu/drm/i915/intel_pch.c
> > +++ b/drivers/gpu/drm/i915/intel_pch.c
> > @@ -69,6 +69,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/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h
> > index e6a2d65f19c6..c29c81ec7971 100644
> > --- a/drivers/gpu/drm/i915/intel_pch.h
> > +++ b/drivers/gpu/drm/i915/intel_pch.h
> > @@ -41,6 +41,7 @@ enum intel_pch {
> >  #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_MCC_DEVICE_ID_TYPE		0x4B00
> >  #define INTEL_PCH_MCC2_DEVICE_ID_TYPE		0x3880
> 
> Hi,
> 
> Please add this in -fixes so 5.4 will get it, thanks.
> 
> 
> -- 
> t

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795