Works fine, thanks. Tested-by: Tomas Bzatek <bugs@xxxxxxxxxx> On Thu, 2022-02-24 at 15:21 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > This JSP2 PCH actually seems to to be some special Apple > specific ICP variant rather than a JSP. Make it so. Or at > least all the references to it seem to be some Apple ICL > machines. Didn't manage to find these PCI IDs in any > public chipset docs unfortunately. > > The only thing we're losing here with this JSP->ICP change > is Wa_14011294188, but based on the HSD that isn't actually > needed on any ICP based design (including JSP), only TGP > based stuff (including MCC) really need it. The documented > w/a just never made that distinction because Windows didn't > want to differentiate between JSP and MCC (not sure how > they handle hpd/ddc/etc. then though...). > > Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> > Cc: Vivek Kasireddy <vivek.kasireddy@xxxxxxxxx> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/4226 > Fixes: 943682e3bd19 ("drm/i915: Introduce Jasper Lake PCH") > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Acked-by: Vivek Kasireddy <vivek.kasireddy@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_pch.c | 2 +- > drivers/gpu/drm/i915/intel_pch.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c > index 4f7a61d5502e..4cce044efde2 100644 > --- a/drivers/gpu/drm/i915/intel_pch.c > +++ b/drivers/gpu/drm/i915/intel_pch.c > @@ -108,6 +108,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) > /* Comet Lake V PCH is based on KBP, which is SPT compatible */ > return PCH_SPT; > case INTEL_PCH_ICP_DEVICE_ID_TYPE: > + case INTEL_PCH_ICP2_DEVICE_ID_TYPE: > drm_dbg_kms(&dev_priv->drm, "Found Ice Lake PCH\n"); > drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv)); > return PCH_ICP; > @@ -123,7 +124,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) > !IS_GEN9_BC(dev_priv)); > return PCH_TGP; > case INTEL_PCH_JSP_DEVICE_ID_TYPE: > - case INTEL_PCH_JSP2_DEVICE_ID_TYPE: > drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n"); > drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv)); > return PCH_JSP; > diff --git a/drivers/gpu/drm/i915/intel_pch.h b/drivers/gpu/drm/i915/intel_pch.h > index 6fd20408f7bf..b7a8cf409d48 100644 > --- a/drivers/gpu/drm/i915/intel_pch.h > +++ b/drivers/gpu/drm/i915/intel_pch.h > @@ -50,11 +50,11 @@ enum intel_pch { > #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_ICP2_DEVICE_ID_TYPE 0x3880 > #define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00 > #define INTEL_PCH_TGP_DEVICE_ID_TYPE 0xA080 > #define INTEL_PCH_TGP2_DEVICE_ID_TYPE 0x4380 > #define INTEL_PCH_JSP_DEVICE_ID_TYPE 0x4D80 > -#define INTEL_PCH_JSP2_DEVICE_ID_TYPE 0x3880 > #define INTEL_PCH_ADP_DEVICE_ID_TYPE 0x7A80 > #define INTEL_PCH_ADP2_DEVICE_ID_TYPE 0x5180 > #define INTEL_PCH_ADP3_DEVICE_ID_TYPE 0x7A00
