Skip to contentSkip to conversation

drm/i915/cml: Add second PCH ID for CMP

PATCH In review Matt Roper 8 participants 15 messages Sep 16, 2019 – Oct 9, 2019

Subsystems (2)
lore
Share & tools
lore

Matt Roper

author
#0 lore raw

PATCH 1/1 drm/i915/cml: Add second PCH ID for CMP

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +1 -0
index e6a2d65f19c6..c29c81ec7971 100644
@@ -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
Signature · 6 lines
2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915/cml: Add second PCH ID for CMP

== Series Details ==

== Series Details ==

Series: drm/i915/cml: Add second PCH ID for CMP
URL : https://patchwork.freedesktop.org/series/66782/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
96520eb9d5e8 drm/i915/cml: Add second PCH ID for CMP
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#6: 
The CMP PCH ID we have in the driver is correct for the CML-U machines we have

-:12: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 729ae330a0f2 ("drm/i915/cml: Introduce Comet Lake PCH")' #12:
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")

total: 1 errors, 1 warnings, 0 checks, 14 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for drm/i915/cml: Add second PCH ID for CMP

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: drm/i915/cml: Add second PCH ID for CMP
URL : https://patchwork.freedesktop.org/series/66782/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6905 -> Patchwork_14423
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_14423:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@kms_chamelium@dp-hpd-fast:
- {fi-cml-s}: NOTRUN -> [SKIP][1] +8 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-cml-s/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_14423 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [PASS][2] -> [INCOMPLETE][3] ([fdo#107713] / [fdo#109100])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-icl-u3/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-icl-u3/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_switch@rcs0:
- fi-icl-u2: [INCOMPLETE][4] ([fdo#107713]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-icl-u2/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-icl-u2/igt@[email protected]

* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [INCOMPLETE][6] ([fdo#107718]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-blb-e6850/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-blb-e6850/igt@[email protected]

* igt@i915_module_load@reload:
- {fi-icl-u4}: [DMESG-WARN][8] ([fdo#105602]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-icl-u4/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-icl-u4/igt@[email protected]

* igt@i915_selftest@live_reset:
- {fi-icl-dsi}: [INCOMPLETE][10] ([fdo#107713]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-icl-dsi/igt@i915_selftest@live_reset.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-icl-dsi/igt@i915_selftest@live_reset.html

* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: [DMESG-WARN][12] ([fdo#106387]) -> [PASS][13] +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/fi-ilk-650/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/fi-ilk-650/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#106350]: https://bugs.freedesktop.org/show_bug.cgi?id=106350
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#111562]: https://bugs.freedesktop.org/show_bug.cgi?id=111562
[fdo#111597]: https://bugs.freedesktop.org/show_bug.cgi?id=111597

Participating hosts (55 -> 48)
------------------------------

Additional (1): fi-apl-guc
Missing (8): fi-ilk-m540 fi-cml-h fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_6905 -> Patchwork_14423

CI-20190529: 20190529
CI_DRM_6905: bd6c56f50d15b22e2348488769580e8a6a378f6b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5186: 0008b3e1b2cf7a73b1e995031c9a73fc97b35aad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14423: 96520eb9d5e861f7c8c51e387121a9dd133efebb @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

96520eb9d5e8 drm/i915/cml: Add second PCH ID for CMP

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Matt Roper
Quoted 3 lines · Matt Roper

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

Quoted 43 lines

different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +1 -1
index e6a2d65f19c6..c29c81ec7971 100644
@@ -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
--

2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Lucas De Marchi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#4 lore raw
Quoted 8 lines · Lucas De Marchi
Quoted 3 lines · Matt Roper

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

Quoted 50 lines

Lucas De Marchi

Quoted 43 lines

different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +1 -1
index e6a2d65f19c6..c29c81ec7971 100644
@@ -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
--

2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 1 line
Lucas De Marchi
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

HI,

Quoted 24 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Matt Roper
Sent: tiistai 17. syyskuuta 2019 3.35
To: Lucas De Marchi <[email protected]>
Cc: Intel Graphics <[email protected]>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP

Quoted 1 line · Lucas De Marchi

On Mon, Sep 16, 2019 at 4:33 PM Matt Roper <[email protected]>

Quoted 8 lines · wrote:
Quoted 4 lines

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.

Quoted 5 lines

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/ ...

Quoted 59 lines

Matt

Quoted 15 lines

Lucas De Marchi

Quoted 13 lines

different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
Quoted 6 lines

drivers/gpu/drm/i915/intel_pch.c intel_pch_type(const struct drm_i915_private *dev_priv,

Quoted 6 lines
drivers/gpu/drm/i915/intel_pch.c +0 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -69,6 +69,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv,

unsigned short id)

Quoted 23 lines
Quoted 23 lines
drivers/gpu/drm/i915/intel_pch.c +1 -0
                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

drivers/gpu/drm/i915/intel_pch.h +1 -1
@@ -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
--

2.21.0

Quoted 9 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Lucas De Marchi

Quoted 10 lines

--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#6 lore raw
Quoted 26 lines · Jani

HI,

Quoted 24 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Matt Roper
Sent: tiistai 17. syyskuuta 2019 3.35
To: Lucas De Marchi <[email protected]>
Cc: Intel Graphics <[email protected]>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/cml: Add second PCH ID for CMP

Quoted 1 line · Lucas De Marchi

On Mon, Sep 16, 2019 at 4:33 PM Matt Roper <[email protected]>

Quoted 8 lines · wrote:
Quoted 4 lines

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.

Quoted 7 lines
Quoted 5 lines

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

Quoted 70 lines
Quoted 70 lines

Matt

Quoted 15 lines

Lucas De Marchi

Quoted 13 lines

different PCH ID, leading our driver to detect no PCH for them.

Cc: Rodrigo Vivi <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
Quoted 6 lines

drivers/gpu/drm/i915/intel_pch.c intel_pch_type(const struct drm_i915_private *dev_priv,

Quoted 6 lines
drivers/gpu/drm/i915/intel_pch.c +0 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -69,6 +69,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv,

unsigned short id)

Quoted 23 lines
Quoted 23 lines
drivers/gpu/drm/i915/intel_pch.c +1 -0
                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

drivers/gpu/drm/i915/intel_pch.h +1 -1
@@ -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
--

2.21.0

Quoted 9 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

✓ Fi.CI.IGT: success for drm/i915/cml: Add second PCH ID for CMP

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: drm/i915/cml: Add second PCH ID for CMP
URL : https://patchwork.freedesktop.org/series/66782/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6905_full -> Patchwork_14423_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Known issues
------------

Here are the changes found in Patchwork_14423_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_isolation@vcs1-none:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276]) +13 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb8/igt@[email protected]

* igt@gem_eio@reset-stress:
- shard-glk: [PASS][3] -> [FAIL][4] ([fdo#109661])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-glk2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-glk9/igt@[email protected]

* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#110854])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb8/igt@[email protected]

* igt@gem_exec_flush@basic-batch-kernel-default-uc:
- shard-apl: [PASS][7] -> [INCOMPLETE][8] ([fdo#103927])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-apl2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-apl3/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#111325]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb7/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-snb: [PASS][11] -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-snb4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-snb6/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][13] -> [INCOMPLETE][14] ([fdo#104108] / [fdo#107807])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl9/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl5/igt@[email protected]

* igt@i915_suspend@sysfs-reader:
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([fdo#108566]) +4 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-apl5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-apl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [PASS][17] -> [INCOMPLETE][18] ([fdo#110741])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl5/igt@[email protected]

* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#100368])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl5/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl5/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-iclb: [PASS][21] -> [FAIL][22] ([fdo#103167] / [fdo#110378])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#103167]) +5 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt.html

* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb4/igt@kms_psr@psr2_cursor_render.html

* igt@perf@polling:
- shard-skl: [PASS][27] -> [FAIL][28] ([fdo#110728])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl9/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl6/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_schedule@independent-bsd:
- shard-iclb: [SKIP][29] ([fdo#111325]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb2/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb3/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-128x128-random:
- shard-apl: [INCOMPLETE][31] ([fdo#103927]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-apl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-apl1/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled:
- shard-skl: [FAIL][33] ([fdo#103184] / [fdo#103232] / [fdo#108472]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl9/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl5/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb8888-pwrite-ytiled:
- shard-skl: [FAIL][35] ([fdo#103184] / [fdo#103232] / [fdo#108222]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl1/igt@[email protected]

* igt@kms_flip@dpms-vs-vblank-race:
- shard-glk: [FAIL][37] ([fdo#111609]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-glk2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-glk2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
- shard-iclb: [FAIL][39] ([fdo#103167]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-kbl: [DMESG-WARN][41] ([fdo#103558] / [fdo#105602]) -> [PASS][42] +31 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html

* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +4 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-apl3/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-apl2/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [DMESG-WARN][45] ([fdo#103558] / [fdo#105079] / [fdo#105602]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-kbl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-kbl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][47] ([fdo#108145] / [fdo#110403]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-skl5/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-skl4/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][49] ([fdo#103166]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb4/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][51] ([fdo#109642] / [fdo#111068]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@[email protected]

* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][53] ([fdo#109441]) -> [PASS][54] +2 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb1/igt@kms_psr@psr2_suspend.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@kms_psr@psr2_suspend.html

* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [SKIP][55] ([fdo#109276]) -> [PASS][56] +18 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb7/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb2/igt@[email protected]

#### Warnings ####

* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [FAIL][57] ([fdo#111330]) -> [SKIP][58] ([fdo#109276])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb5/igt@[email protected]

* igt@kms_atomic_transition@6x-modeset-transitions-nonblocking-fencing:
- shard-kbl: [SKIP][59] ([fdo#105602] / [fdo#109271] / [fdo#109278]) -> [SKIP][60] ([fdo#109271] / [fdo#109278]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-kbl6/igt@kms_atomic_transition@6x-modeset-transitions-nonblocking-fencing.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-kbl7/igt@kms_atomic_transition@6x-modeset-transitions-nonblocking-fencing.html

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][61] ([fdo#107724]) -> [SKIP][62] ([fdo#109349])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-iclb2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-iclb5/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-pwrite:
- shard-kbl: [SKIP][63] ([fdo#105602] / [fdo#109271]) -> [SKIP][64] ([fdo#109271]) +14 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-kbl6/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-pwrite.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-kbl7/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-pwrite.html

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparant-fb:
- shard-kbl: [DMESG-FAIL][65] ([fdo#103558] / [fdo#105602] / [fdo#108145]) -> [FAIL][66] ([fdo#108145]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6905/shard-kbl6/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/shard-kbl7/igt@[email protected]

[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108222]: https://bugs.freedesktop.org/show_bug.cgi?id=108222
[fdo#108472]: https://bugs.freedesktop.org/show_bug.cgi?id=108472
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111609]: https://bugs.freedesktop.org/show_bug.cgi?id=111609

Participating hosts (9 -> 9)
------------------------------

No changes in participating hosts

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_6905 -> Patchwork_14423

CI-20190529: 20190529
CI_DRM_6905: bd6c56f50d15b22e2348488769580e8a6a378f6b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5186: 0008b3e1b2cf7a73b1e995031c9a73fc97b35aad @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14423: 96520eb9d5e861f7c8c51e387121a9dd133efebb @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14423/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw
In reply to Matt Roper

Quoting Matt Roper (2019-09-17 00:32:51)

Quoted 9 lines

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

Acked (HW sprang to life is a good indication the ids are correct) and pushed.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#9 lore raw
In reply to Matt Roper

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +1 -0
index e6a2d65f19c6..c29c81ec7971 100644
@@ -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
Signature · 6 lines
2.21.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

✗ Fi.CI.BAT: failure for drm/i915/cml: Add second PCH ID for CMP (rev2)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: drm/i915/cml: Add second PCH ID for CMP (rev2)
URL : https://patchwork.freedesktop.org/series/66782/
State : failure

== Summary ==

Applying: drm/i915/cml: Add second PCH ID for CMP
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_pch.c
M drivers/gpu/drm/i915/intel_pch.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw
In reply to Matt Roper
Quoted 31 lines · Matt Roper

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +0 -0
index e6a2d65f19c6..c29c81ec7971 100644

drivers/gpu/drm/i915/intel_pch.h enum intel_pch { · line 47

Quoted 7 lines
drivers/gpu/drm/i915/intel_pch.h +1 -0
@@ -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.

Signature · 5 lines
t
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#12 lore raw
Quoted 10 lines · Timo Aaltonen
Quoted 9 lines · Matt Roper

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

Quoted 37 lines
Quoted 22 lines
---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +0 -0
index e6a2d65f19c6..c29c81ec7971 100644

drivers/gpu/drm/i915/intel_pch.h enum intel_pch { · line 47

Quoted 7 lines
drivers/gpu/drm/i915/intel_pch.h +1 -0
@@ -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.

Signature · 1 line
t
Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#13 lore raw
Quoted 6 lines · Matt Roper
Quoted 5 lines · Timo Aaltonen
Quoted 4 lines · Matt Roper

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.

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

Cc: Rodrigo Vivi <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

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....

Quoted 33 lines
Quoted 33 lines
Quoted 23 lines
---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +0 -0
index e6a2d65f19c6..c29c81ec7971 100644

drivers/gpu/drm/i915/intel_pch.h enum intel_pch { · line 47

Quoted 7 lines
drivers/gpu/drm/i915/intel_pch.h +1 -0
@@ -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,

Quoted 12 lines
Quoted 5 lines

Please add this in -fixes so 5.4 will get it, thanks.

Signature · 1 line
t
Signature · 5 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw
Quoted 13 lines · Rodrigo Vivi
Quoted 12 lines · Matt Roper
Quoted 10 lines · Timo Aaltonen
Quoted 9 lines · Matt Roper

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 <[email protected]>
Cc: Anusha Srivatsa <[email protected]>
References: 729ae330a0f2e2 ("drm/i915/cml: Introduce Comet Lake PCH")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111461

Quoted 7 lines
Quoted 1 line

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

Quoted 48 lines

instead of References....

Quoted 33 lines
Quoted 33 lines
Quoted 23 lines
---
 drivers/gpu/drm/i915/intel_pch.c | 1 +
 drivers/gpu/drm/i915/intel_pch.h | 1 +
 2 files changed, 2 insertions(+)
drivers/gpu/drm/i915/intel_pch.c +1 -0
index fa864d8f2b73..15f8bff141f9 100644
@@ -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 */
drivers/gpu/drm/i915/intel_pch.h +0 -0
index e6a2d65f19c6..c29c81ec7971 100644

drivers/gpu/drm/i915/intel_pch.h enum intel_pch { · line 47

Quoted 7 lines
drivers/gpu/drm/i915/intel_pch.h +1 -0
@@ -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,

Quoted 12 lines
Quoted 5 lines

Please add this in -fixes so 5.4 will get it, thanks.

Signature · 1 line
t
Signature · 5 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx