Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
On Wed, Oct 09, 2019 at 01:00:07PM -0700, Rodrigo Vivi wrote:
> On Wed, Oct 09, 2019 at 10:29:43AM -0700, Matt Roper wrote:
> > 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
> > > > Cc: Anusha Srivatsa
> > > > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > > > Signed-off-by: Matt Roper
> >
> > Cc: drm-intel-fi...@lists.freedesktop.org
>
> I don't believe this list even exist anymore.
>
> The right way would be:
>
> Fixes: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Hmm - just curious on the semantics, as the "Fixes" tag implies that the
original patch was broken, but it wasn't - just new PCH IDs have been
added since.
-James
>
> instead of References
>
> >
> > > > ---
> > > > 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_TYPE0x9D80
> > > > #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
> ___
> 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
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
On Wed, Oct 09, 2019 at 10:29:43AM -0700, Matt Roper wrote:
> 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
> > > Cc: Anusha Srivatsa
> > > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > > Signed-off-by: Matt Roper
>
> Cc: drm-intel-fi...@lists.freedesktop.org
I don't believe this list even exist anymore.
The right way would be:
Fixes: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
instead of References
>
> > > ---
> > > 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_TYPE0x0680
> > > #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
> > > #define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00
> > > #define INTEL_PCH_MCC2_DEVICE_ID_TYPE0x3880
> >
> > 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
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
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
> > Cc: Anusha Srivatsa
> > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > Signed-off-by: Matt Roper
Cc: drm-intel-fi...@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_TYPE0x9D80
> > #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
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
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
> Cc: Anusha Srivatsa
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper
> ---
> 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_TYPE0x0680
> #define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
> #define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00
> #define INTEL_PCH_MCC2_DEVICE_ID_TYPE0x3880
Hi,
Please add this in -fixes so 5.4 will get it, thanks.
--
t
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
Quoting Matt Roper (2019-09-17 00:32:51)
> 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
> Cc: Anusha Srivatsa
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper
Acked (HW sprang to life is a good indication the ids are correct) and
pushed.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
On Mon, Sep 16, 2019 at 09:50:00PM -0700, Saarinen, Jani wrote:
> HI,
>
> > -Original Message-
> > From: Intel-gfx [mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf
> > Of Matt
> > Roper
> > Sent: tiistai 17. syyskuuta 2019 3.35
> > To: Lucas De Marchi
> > Cc: Intel Graphics
> > Subject: Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
> >
> > On Mon, Sep 16, 2019 at 05:26:10PM -0700, Lucas De Marchi wrote:
> > > On Mon, Sep 16, 2019 at 4:33 PM 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
> > >
> > > CML-S is back to life, but CML-H is still failing. Is CML-H actually
> > > using the same PCH?
> > >
> >
> > According to the CI's lspci output for each machine, CML-S has 0x0681 and
> > CML-H
> > has 0x068C. We only care about the upper 9 bits, so a DEVICE_ID_TYPE of
> > 0x0680
> > should handle both of them.
> >
> > It looks like CML-H wasn't even attempted by CI (no failure for igt@runner
> > like we
> > had before, just no results at all for anything).
> > The CI BAT email say it wasn't a participating host (along with a handful
> > of others),
> > but I'm not sure what leads to that --- does it just mean the platform has
> > been
> > temporarily taken offline?
> No, it probably just did not boot properly or something else, Tomi?
> It did something:
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-cml-h/ ...
I re-sent this through trybot to see if I could get a valid result for
cml-h, but now cml-h appears to have completely disappeared from the
machine list:
https://intel-gfx-ci.01.org/tree/drm-tip/Trybot_5035/index.html
and wasn't even listed as missing in the "participating hosts" part of
the report. It's also missing from the general results page at:
https://intel-gfx-ci.01.org/tree/drm-tip/index.html
Anyway, based on the cml-s results it appears this patch does do what we
hoped and fixes the PCH detection. Lucas, do you feel comfortable
giving it a r-b so we can apply it or do you want to wait until the
cml-h CI machine comes back?
Matt
>
> >
> >
> > Matt
> >
> > > Lucas De Marchi
> > >
> > > > different PCH ID, leading our driver to detect no PCH for them.
> > > >
> > > > Cc: Rodrigo Vivi
> > > > Cc: Anusha Srivatsa
> > > > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake
> > > > PCH")
> > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > > > Signed-off-by: Matt Roper
> > > > ---
> > > > 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_TYPE0x9D80
> > > > #define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280
> > > > +#define INTEL_PCH_CMP2_DEVICE_ID_TYPE 0x0680
> > > > #define INTEL_PC
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
HI,
> -Original Message-
> From: Intel-gfx [mailto:intel-gfx-boun...@lists.freedesktop.org] On Behalf Of
> Matt
> Roper
> Sent: tiistai 17. syyskuuta 2019 3.35
> To: Lucas De Marchi
> Cc: Intel Graphics
> Subject: Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
>
> On Mon, Sep 16, 2019 at 05:26:10PM -0700, Lucas De Marchi wrote:
> > On Mon, Sep 16, 2019 at 4:33 PM 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
> >
> > CML-S is back to life, but CML-H is still failing. Is CML-H actually
> > using the same PCH?
> >
>
> According to the CI's lspci output for each machine, CML-S has 0x0681 and
> CML-H
> has 0x068C. We only care about the upper 9 bits, so a DEVICE_ID_TYPE of
> 0x0680
> should handle both of them.
>
> It looks like CML-H wasn't even attempted by CI (no failure for igt@runner
> like we
> had before, just no results at all for anything).
> The CI BAT email say it wasn't a participating host (along with a handful of
> others),
> but I'm not sure what leads to that --- does it just mean the platform has
> been
> temporarily taken offline?
No, it probably just did not boot properly or something else, Tomi?
It did something:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-cml-h/ ...
>
>
> Matt
>
> > Lucas De Marchi
> >
> > > different PCH ID, leading our driver to detect no PCH for them.
> > >
> > > Cc: Rodrigo Vivi
> > > Cc: Anusha Srivatsa
> > > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake
> > > PCH")
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > > Signed-off-by: Matt Roper
> > > ---
> > > 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_TYPE0x9D80
> > > #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
> > > --
> > > 2.21.0
> > >
> > > ___
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> >
> >
> > --
> > Lucas De Marchi
>
> --
> Matt Roper
> Graphics Software Engineer
> VTT-OSGC Platform Enablement
> Intel Corporation
> (916) 356-2795
> ___
> 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
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
On Mon, Sep 16, 2019 at 05:26:10PM -0700, Lucas De Marchi wrote:
> On Mon, Sep 16, 2019 at 4:33 PM 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
>
> CML-S is back to life, but CML-H is still failing. Is CML-H actually
> using the same PCH?
>
According to the CI's lspci output for each machine, CML-S has 0x0681
and CML-H has 0x068C. We only care about the upper 9 bits, so a
DEVICE_ID_TYPE of 0x0680 should handle both of them.
It looks like CML-H wasn't even attempted by CI (no failure for
igt@runner like we had before, just no results at all for anything).
The CI BAT email say it wasn't a participating host (along with a
handful of others), but I'm not sure what leads to that --- does it just
mean the platform has been temporarily taken offline?
Matt
> Lucas De Marchi
>
> > different PCH ID, leading our driver to detect no PCH for them.
> >
> > Cc: Rodrigo Vivi
> > Cc: Anusha Srivatsa
> > References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> > Signed-off-by: Matt Roper
> > ---
> > 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_TYPE0x9D80
> > #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
> > --
> > 2.21.0
> >
> > ___
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Lucas De Marchi
--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP
On Mon, Sep 16, 2019 at 4:33 PM 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
CML-S is back to life, but CML-H is still failing. Is CML-H actually
using the same PCH?
Lucas De Marchi
> different PCH ID, leading our driver to detect no PCH for them.
>
> Cc: Rodrigo Vivi
> Cc: Anusha Srivatsa
> References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461
> Signed-off-by: Matt Roper
> ---
> 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_TYPE0x9D80
> #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
> --
> 2.21.0
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Lucas De Marchi
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
