drm/i915: Fix PCH names for KBP and CNP.
Subsystems (2)
Rodrigo Vivi
maintainerPATCH 1/1 drm/i915: Fix PCH names for KBP and CNP.
No functional change.
KBP was based on SPT and spec wasn't clear about the full name. There was the initial point of the "Point" confusion.
Later the split with Coffee Lake and Cannon Lake both using CNP and also some uncertainty from the specs we had at that time made us to propagated the mistake along.
So, let's fix this now and avoid propagating these wrong "points".
--- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -3
@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_KBP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_KBP ; -DRM_DEBUG_KMS ("Found KabyPoint PCH\n" ); +DRM_DEBUG_KMS ("Found Kaby Lake PCH (KBP)\n" );WARN_ON (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE (dev_priv)); }else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ; -DRM_DEBUG_KMS ("Found CannonPoint PCH\n" ); +DRM_DEBUG_KMS ("Found Cannon Lake PCH (CNP)\n" );WARN_ON (!IS_CANNONLAKE (dev_priv) && !IS_COFFEELAKE (dev_priv)); }else if (id ==INTEL_PCH_CNP_LP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ; -DRM_DEBUG_KMS ("Found CannonPoint LP PCH\n" ); +DRM_DEBUG_KMS ("Found Cannon Lake LP PCH (CNP-LP)\n" );WARN_ON (!IS_CANNONLAKE (dev_priv) && !IS_COFFEELAKE (dev_priv)); } else if (id == INTEL_PCH_P2X_DEVICE_ID_TYPE ||
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -1166,8 +1166,8 @@ enum intel_pch {PCH_CPT ,/* Cougarpoint/Pantherpoint PCH */ PCH_LPT ,/* Lynxpoint/Wildcatpoint PCH */ PCH_SPT ,/* Sunrisepoint PCH */ -PCH_KBP ,/* Kabypoint PCH */ -PCH_CNP ,/* Cannonpoint PCH */ +PCH_KBP ,/* Kaby Lake PCH */ +PCH_CNP ,/* Cannon Lake PCH */ PCH_NOP, };
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
Quoted 11 lines
No functional change.
KBP was based on SPT and spec wasn't clear about the full name. There was the initial point of the "Point" confusion.
Later the split with Coffee Lake and Cannon Lake both using CNP and also some uncertainty from the specs we had at that time made us to propagated the mistake along.
So, let's fix this now and avoid propagating these wrong "points".
Can't we go further and try to hardcode the used PCH based on the graphics PCI ID? I mean, skip detection entirely.
Quoted 59 lines
Cc Anusha Srivatsa <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>---
drivers/gpu/drm/i915/i915_drv.c | 6 +++---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--2 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) !IS_KABYLAKE(dev_priv)); } else if (id == INTEL_PCH_KBP_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_KBP; -DRM_DEBUG_KMS ("Found KabyPoint PCH\n"); + DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
WARN_ON(!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv)); } else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE) {
dev_priv->pch_type=PCH_CNP;drivers/gpu/drm/i915/i915_drv.c +0
-1- DRM_DEBUG_KMS("Found CannonPointPCH\n");
drivers/gpu/drm/i915/i915_drv.c +1
-0+ DRM_DEBUG_KMS("Found Cannon Lake PCH(CNP)\n");
WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); } else if (id ==INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {
dev_priv->pch_type=PCH_CNP;drivers/gpu/drm/i915/i915_drv.c +0
-1- DRM_DEBUG_KMS("Found CannonPoint LPPCH\n");
drivers/gpu/drm/i915/i915_drv.c +1
-0+ DRM_DEBUG_KMS("Found Cannon Lake LPPCH (CNP-LP)\n");
WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); } else if (id ==INTEL_PCH_P2X_DEVICE_ID_TYPE||drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1166,8 +1166,8 @@ enum intel_pch {
PCH_CPT, /* Cougarpoint/Pantherpoint PCH */
PCH_LPT, /* Lynxpoint/Wildcatpoint PCH */
PCH_SPT, /* Sunrisepoint PCH */drivers/gpu/drm/i915/i915_drv.h +2
-2- PCH_KBP, /* Kabypoint PCH */ - PCH_CNP, /* Cannonpoint PCH */ + PCH_KBP, /* Kaby Lake PCH */ + PCH_CNP, /* Cannon Lake PCH */
Quoted 3 lines
PCH_NOP,
};
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 10 lines · Paulo Zanoni
Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
Quoted 9 lines
No functional change.
KBP was based on SPT and spec wasn't clear about the full name. There was the initial point of the "Point" confusion.
Later the split with Coffee Lake and Cannon Lake both using CNP and also some uncertainty from the specs we had at that time made us to propagated the mistake along.
Quoted 5 lines
Quoted 2 lines
So, let's fix this now and avoid propagating these wrong "points".
Can't we go further and try to hardcode the used PCH based on the graphics PCI ID? I mean, skip detection entirely.
I don't think so... one case I can remember is that we can have KBL (5916) on SPT and on KBP.
Quoted 55 lines
Quoted 55 lines
Cc Anusha Srivatsa <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-2@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_KBP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_KBP ; -DRM_DEBUG_KMS ("Found KabyPoint PCH\n"); + DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");WARN_ON (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ; -DRM_DEBUG_KMS ("Found CannonPoint PCH\n"); + DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) &&drivers/gpu/drm/i915/i915_drv.c +0
-0!IS_COFFEELAKE(dev_priv)); } else if (id ==
INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {drivers/gpu/drm/i915/i915_drv.c +0
-1dev_priv->pch_type =PCH_CNP ; - DRM_DEBUG_KMS("Found CannonPoint LPPCH\n");
drivers/gpu/drm/i915/i915_drv.c +1
-0+ DRM_DEBUG_KMS("Found Cannon Lake LPPCH (CNP-LP)\n");
drivers/gpu/drm/i915/i915_drv.c +0
-0WARN_ON (!IS_CANNONLAKE (dev_priv) && !IS_COFFEELAKE (dev_priv)); } else if (id ==
INTEL_PCH_P2X_DEVICE_ID_TYPE||drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1166,8 +1166,8 @@ enum intel_pch {PCH_CPT ,/* Cougarpoint/Pantherpoint PCH */ PCH_LPT, /* Lynxpoint/Wildcatpoint PCH */
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h enum intel_pch { · line 1173
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +2
-2PCH_SPT ,/* Sunrisepoint PCH */ -PCH_KBP ,/* Kabypoint PCH */ -PCH_CNP ,/* Cannonpoint PCH */ +PCH_KBP ,/* Kaby Lake PCH */ +PCH_CNP ,/* Cannon Lake PCH */ PCH_NOP, };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Srivatsa, Anusha
Reviewed-byQuoted 82 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Monday, July 31, 2017 12:10 PM
To: Zanoni, Paulo R <[email protected]>
Cc: [email protected]; Srivatsa, Anusha <[email protected]>
Subject: Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.Quoted 6 lines · Paulo Zanoni
Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
Quoted 5 lines
No functional change.
KBP was based on SPT and spec wasn't clear about the full name. There was the initial point of the "Point" confusion.
Quoted 8 lines
Quoted 5 lines
Later the split with Coffee Lake and Cannon Lake both using CNP and also some uncertainty from the specs we had at that time made us to propagated the mistake along.
So, let's fix this now and avoid propagating these wrong "points".
Can't we go further and try to hardcode the used PCH based on the graphics PCI ID? I mean, skip detection entirely.
I don't think so... one case I can remember is that we can have KBL (5916) on SPT and on KBP.
Quoted 55 lines
Quoted 55 lines
Cc Anusha Srivatsa <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex214555e813f1..9561c2a19fc1100644drivers/gpu/drm/i915/i915_drv.c +2
-2@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_KBP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_KBP ; -DRM_DEBUG_KMS ("Found KabyPoint PCH\n"); + DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");WARN_ON (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ; -DRM_DEBUG_KMS ("Found CannonPoint PCH\n"); + DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) &&drivers/gpu/drm/i915/i915_drv.c +0
-0!IS_COFFEELAKE(dev_priv)); } else if (id ==
INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) {drivers/gpu/drm/i915/i915_drv.c +0
-1dev_priv->pch_type =PCH_CNP ; - DRM_DEBUG_KMS("Found CannonPoint LPPCH\n");
drivers/gpu/drm/i915/i915_drv.c +1
-0+ DRM_DEBUG_KMS("Found Cannon Lake LPPCH (CNP-LP)\n");
drivers/gpu/drm/i915/i915_drv.c +0
-0WARN_ON (!IS_CANNONLAKE (dev_priv) && !IS_COFFEELAKE (dev_priv)); } else if (id ==
INTEL_PCH_P2X_DEVICE_ID_TYPE||(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindexd63645a521c4..bc1755657189100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1166,8 +1166,8 @@ enum intel_pch {PCH_CPT ,/* Cougarpoint/Pantherpoint PCH */ PCH_LPT, /* Lynxpoint/Wildcatpoint PCH */
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h enum intel_pch { · line 1173
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +2
-2PCH_SPT ,/* Sunrisepoint PCH */ -PCH_KBP ,/* Kabypoint PCH */ -PCH_CNP ,/* Cannonpoint PCH */ +PCH_KBP ,/* Kaby Lake PCH */ +PCH_CNP ,/* Cannon Lake PCH */ PCH_NOP, };
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
Appliedmerged to dinq, thanks for review
Quoted 97 lines · Anusha
Reviewed-by Anusha Srivatsa <[email protected]>Quoted 82 lines
-----Original Message-----
From: Vivi, Rodrigo
Sent: Monday, July 31, 2017 12:10 PM
To: Zanoni, Paulo R <[email protected]>
Cc: [email protected]; Srivatsa, Anusha <[email protected]>
Subject: Re: [PATCH] drm/i915: Fix PCH names for KBP and CNP.Quoted 6 lines · Paulo Zanoni
Em Seg, 2017-07-31 às 11:52 -0700, Rodrigo Vivi escreveu:
Quoted 5 lines
No functional change.
KBP was based on SPT and spec wasn't clear about the full name. There was the initial point of the "Point" confusion.
Quoted 8 lines
Quoted 5 lines
Later the split with Coffee Lake and Cannon Lake both using CNP and also some uncertainty from the specs we had at that time made us to propagated the mistake along.
So, let's fix this now and avoid propagating these wrong "points".
Can't we go further and try to hardcode the used PCH based on the graphics PCI ID? I mean, skip detection entirely.
I don't think so... one case I can remember is that we can have KBL (5916) on SPT and on KBP.
Quoted 55 lines
Quoted 55 lines
Cc Anusha Srivatsa <[email protected]>Cc Paulo Zanoni <[email protected]>Signed-off-by Rodrigo Vivi <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 6 +++--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex214555e813f1..9561c2a19fc1100644drivers/gpu/drm/i915/i915_drv.c +2
-2@@ -237,17 +237,17 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_KBP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_KBP ; -DRM_DEBUG_KMS ("Found KabyPoint PCH\n"); + DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");WARN_ON (!IS_SKYLAKE (dev_priv) && !IS_KABYLAKE(dev_priv)); }else if (id ==INTEL_PCH_CNP_DEVICE_ID_TYPE ) { dev_priv->pch_type =PCH_CNP ; -DRM_DEBUG_KMS ("Found CannonPoint PCH\n"); + DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) &&!IS_COFFEELAKE(dev_priv)); } else if (id == INTEL_PCH_CNP_LP_DEVICE_ID_TYPE) { dev_priv->pch_type = PCH_CNP; - DRM_DEBUG_KMS("Found CannonPoint LP PCH\n"); + DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n"); WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv)); } else if (id ==
INTEL_PCH_P2X_DEVICE_ID_TYPE||(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindexd63645a521c4..bc1755657189100644drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -1166,8 +1166,8 @@ enum intel_pch {PCH_CPT ,/* Cougarpoint/Pantherpoint PCH */ PCH_LPT, /* Lynxpoint/Wildcatpoint PCH */Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h enum intel_pch { · line 1173
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.h +2
-2PCH_SPT ,/* Sunrisepoint PCH */ -PCH_KBP ,/* Kabypoint PCH */ -PCH_CNP ,/* Cannonpoint PCH */ +PCH_KBP ,/* Kaby Lake PCH */ +PCH_CNP ,/* Cannon Lake PCH */ PCH_NOP, };_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Fix PCH names for KBP and CNP.
In reply to Rodrigo Vivi== Series Details ==
== Series Details ==
Series: drm/i915: Fix PCH names for KBP and CNP.
URL : https://patchwork.freedesktop.org/series/28150/
State : success
== Summary ==
Series 28150v1 drm/i915: Fix PCH names for KBP and CNP.
https://patchwork.freedesktop.org/api/1.0/series/28150/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
dmesg-warn -> PASS (fi-pnv-d510) fdo#101597 +1
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-j1900) fdo#101705fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:441s fi-bdw-gvtdvm total:280 pass:266 dwarn:0 dfail:0 fail:0 skip:14 time:433s fi-blb-e6850 total:280 pass:225 dwarn:1 dfail:0 fail:0 skip:54 time:360s fi-bsw-n3050 total:280 pass:244 dwarn:0 dfail:0 fail:0 skip:36 time:538s fi-bxt-j4205 total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:511s fi-byt-j1900 total:280 pass:256 dwarn:0 dfail:0 fail:0 skip:24 time:489s fi-byt-n2820 total:280 pass:251 dwarn:1 dfail:0 fail:0 skip:28 time:492s fi-glk-2a total:280 pass:261 dwarn:0 dfail:0 fail:0 skip:19 time:603s fi-hsw-4770 total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:438s fi-hsw-4770r total:280 pass:264 dwarn:0 dfail:0 fail:0 skip:16 time:413s fi-ilk-650 total:280 pass:230 dwarn:0 dfail:0 fail:0 skip:50 time:417s fi-ivb-3520m total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:499s fi-ivb-3770 total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:467s fi-kbl-7560u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:573s fi-kbl-r total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:587s fi-pnv-d510 total:280 pass:223 dwarn:2 dfail:0 fail:0 skip:55 time:565s fi-skl-6260u total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:468s fi-skl-6700hq total:280 pass:263 dwarn:0 dfail:0 fail:0 skip:17 time:590s fi-skl-6700k total:280 pass:262 dwarn:0 dfail:0 fail:0 skip:18 time:472s fi-skl-6770hq total:280 pass:270 dwarn:0 dfail:0 fail:0 skip:10 time:484s fi-skl-gvtdvm total:280 pass:267 dwarn:0 dfail:0 fail:0 skip:13 time:436s fi-skl-x1585l total:280 pass:269 dwarn:0 dfail:0 fail:0 skip:11 time:473s fi-snb-2520m total:280 pass:252 dwarn:0 dfail:0 fail:0 skip:28 time:545s fi-snb-2600 total:280 pass:251 dwarn:0 dfail:0 fail:0 skip:29 time:407s
87ad0636c140691e13d4485542e5d466c9e42fcd drm-tip: 2017y-07m-31d-15h-32m-42s UTC integration manifest c69181e1a95c drm/i915: Fix PCH names for KBP and CNP.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5300/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx