Skip to contentSkip to conversation

intel: PCI Ids for S SKU in CFL

PATCH In review Anusha Srivatsa 3 participants 9 messages Jun 21, 2017 – Jun 29, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 intel: PCI Ids for S SKU in CFL

Add the PCI IDs for S SKU IN CFL by following the spec.

v2: Update IDs.

---
 intel/intel_chipset.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
intel/intel_chipset.h +16 -1
index 41fc0da..36bbec9 100644
@@ -221,6 +221,12 @@
 #define PCI_CHIP_GLK			0x3184
 #define PCI_CHIP_GLK_2X6		0x3185
 
+#define PCI_CHIP_COFFEELAKE_S_GT1_1     0x3E90
+#define PCI_CHIP_COFFEELAKE_S_GT1_2     0x3E93
+#define PCI_CHIP_COFFEELAKE_S_GT2_1     0x3E91
+#define PCI_CHIP_COFFEELAKE_S_GT2_2     0x3E92
+#define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
+
 #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
 				 (devid) == PCI_CHIP_I915_GM || \
 				 (devid) == PCI_CHIP_I945_GM || \
@@ -452,10 +458,19 @@
 #define IS_GEMINILAKE(devid)	((devid) == PCI_CHIP_GLK || \
 				 (devid) == PCI_CHIP_GLK_2X6)
 
+#define IS_CFL_S(devid)         ((devid) == PCI_CHIP_COFFEELAKE_S_GT1_1 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT1_2 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_1 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 )
+
+#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid))
+
 #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
 				 IS_BROXTON(devid)  || \
 				 IS_KABYLAKE(devid) || \
-				 IS_GEMINILAKE(devid))
+				 IS_GEMINILAKE(devid) || \
+				 IS_COFFEELAKE(devid))
 
 #define IS_9XX(dev)		(IS_GEN3(dev) || \
 				 IS_GEN4(dev) || \
Signature · 6 lines
2.7.4

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

PATCH 2/3 intel: PCI Ids for H SKU in CFL

Add the PCI IDs for H SKU IN CFL by following the spec.

v2: Update IDs

---
 intel/intel_chipset.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
intel/intel_chipset.h +7 -1
index 36bbec9..4da145c 100644
@@ -226,6 +226,8 @@
 #define PCI_CHIP_COFFEELAKE_S_GT2_1     0x3E91
 #define PCI_CHIP_COFFEELAKE_S_GT2_2     0x3E92
 #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
+#define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
+#define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
 
 #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
 				 (devid) == PCI_CHIP_I915_GM || \
@@ -464,7 +466,11 @@
                                 (devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
                                 (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 )
 
-#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid))
+#define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
+
+#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
+				IS_CFL_H(devid))
 
 #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
 				 IS_BROXTON(devid)  || \
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH libdrm 2/3] intel: PCI Ids for H SKU in CFL

Quoted 15 lines · Anusha Srivatsa

Add the PCI IDs for H SKU IN CFL by following the spec.

v2: Update IDs

---
  intel/intel_chipset.h | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
intel/intel_chipset.h +0 -0
index 36bbec9..4da145c 100644

intel/intel_chipset.h line 230

Quoted 5 lines
intel/intel_chipset.h +2 -0
@@ -226,6 +226,8 @@
  #define PCI_CHIP_COFFEELAKE_S_GT2_1     0x3E91
  #define PCI_CHIP_COFFEELAKE_S_GT2_2     0x3E92
  #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
+#define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
+#define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94

Matches BSPEC DID2 values

Quoted 6 lines
intel/intel_chipset.h +0 -0
  #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
  				 (devid) == PCI_CHIP_I915_GM || \
@@ -464,7 +466,11 @@
                                  (devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
                                  (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 )

intel/intel_chipset.h line 476

Quoted 10 lines
intel/intel_chipset.h +5 -1
 
-#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid))
+#define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
+
+#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
+				IS_CFL_H(devid))
 
  #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
  				 IS_BROXTON(devid)  || \

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

#3 lore raw

PATCH 3/3 intel: PCI Ids for U SKU in CFL

In reply to Anusha Srivatsa

Add the PCI IDs for U SKU IN CFL by following the spec.

v2: Update IDs

---
 intel/intel_chipset.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
intel/intel_chipset.h +11 -1
index 4da145c..8a0d4ff 100644
@@ -228,6 +228,10 @@
 #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
 #define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
 #define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT3_1     0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_2     0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_3     0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_4     0x3EA8
 
 #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
 				 (devid) == PCI_CHIP_I915_GM || \
@@ -469,8 +473,14 @@
 #define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
                                  (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
 
+#define IS_CFL_U(devid)         ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+
 #define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
-				IS_CFL_H(devid))
+				IS_CFL_H(devid) || \
+				IS_CFL_U(devid))
 
 #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
 				 IS_BROXTON(devid)  || \
Signature · 6 lines
2.7.4

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

Re: [PATCH libdrm 3/3] intel: PCI Ids for U SKU in CFL

Quoted 15 lines · Anusha Srivatsa

Add the PCI IDs for U SKU IN CFL by following the spec.

v2: Update IDs

---
  intel/intel_chipset.h | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
intel/intel_chipset.h +0 -0
index 4da145c..8a0d4ff 100644

intel/intel_chipset.h line 234

Quoted 7 lines
intel/intel_chipset.h +4 -0
@@ -228,6 +228,10 @@
  #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
  #define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
  #define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT3_1     0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_2     0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_3     0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_4     0x3EA8

0x3EA8 is marked not POR in the current documentation.

-Clint

Quoted 9 lines
intel/intel_chipset.h +2 -0
  #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
  				 (devid) == PCI_CHIP_I915_GM || \
@@ -469,8 +473,14 @@
  #define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
                                   (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
 
+#define IS_CFL_U(devid)         ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \

intel/intel_chipset.h line 486

Quoted 10 lines
intel/intel_chipset.h +5 -1
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+
  #define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
-				IS_CFL_H(devid))
+				IS_CFL_H(devid) || \
+				IS_CFL_U(devid))
 
  #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
  				 IS_BROXTON(devid)  || \

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

#5 lore raw

Re: [PATCH libdrm 3/3] intel: PCI Ids for U SKU in CFL

Quoted 22 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Clint Taylor
Sent: Wednesday, June 21, 2017 12:51 PM
To: [email protected]
Subject: Re: [Intel-gfx] [PATCH libdrm 3/3] intel: PCI Ids for U SKU in CFL

Quoted 10 lines · Anusha Srivatsa

Add the PCI IDs for U SKU IN CFL by following the spec.

v2: Update IDs

---
  intel/intel_chipset.h | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
Quoted 13 lines

intel/intel_chipset.h line 234

Quoted 12 lines
intel/intel_chipset.h index renamed from intel/intel_chipset.h +0 -0

4da145c..8a0d4ff 100644

intel/intel_chipset.h +4 -0
@@ -228,6 +228,10 @@
  #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
  #define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
  #define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT3_1     0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_2     0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_3     0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_4     0x3EA8

0x3EA8 is marked not POR in the current documentation.

Hmm....for now the intention was to match the IDs we currently have in the i915 to libdrm and IGT so that we have same IDs everywhere....

Anusha

Quoted 21 lines

-Clint

intel/intel_chipset.h line 236

Quoted 3 lines
intel/intel_chipset.h +0 -0
  #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
  				 (devid) == PCI_CHIP_I915_GM || \ @@ -469,8

+473,14 @@

Quoted 15 lines
intel/intel_chipset.h +0 -0
  #define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
                                   (devid) ==

PCI_CHIP_COFFEELAKE_H_GT2_2)

intel/intel_chipset.h +8 -1
+#define IS_CFL_U(devid)         ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
+                                 (devid) ==
+PCI_CHIP_COFFEELAKE_U_GT3_4)
+
  #define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
-				IS_CFL_H(devid))
+				IS_CFL_H(devid) || \
+				IS_CFL_U(devid))
Quoted 7 lines
Quoted 2 lines
  #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
  				 IS_BROXTON(devid)  || \

_______________________________________________
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

Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH libdrm 3/3] intel: PCI Ids for U SKU in CFL

In reply to Anusha Srivatsa
Quoted 15 lines · Anusha Srivatsa

Add the PCI IDs for U SKU IN CFL by following the spec.

v2: Update IDs

---
  intel/intel_chipset.h | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
intel/intel_chipset.h +0 -0
index 4da145c..8a0d4ff 100644

intel/intel_chipset.h line 234

Quoted 7 lines
intel/intel_chipset.h +4 -0
@@ -228,6 +228,10 @@
  #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
  #define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
  #define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT3_1     0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_2     0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_3     0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_4     0x3EA8

Matches values in i915 driver.

Quoted 9 lines
intel/intel_chipset.h +2 -0
  #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
  				 (devid) == PCI_CHIP_I915_GM || \
@@ -469,8 +473,14 @@
  #define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1 || \
                                   (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
 
+#define IS_CFL_U(devid)         ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2 || \

intel/intel_chipset.h line 486

Quoted 10 lines
intel/intel_chipset.h +5 -1
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+
  #define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
-				IS_CFL_H(devid))
+				IS_CFL_H(devid) || \
+				IS_CFL_U(devid))
 
  #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
  				 IS_BROXTON(devid)  || \

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

#7 lore raw

Re: [PATCH libdrm 3/3] intel: PCI Ids for U SKU in CFL

series merged to libdrm. thanks for patches and review.

Quoted 56 lines · Clint Taylor
Quoted 16 lines · Anusha Srivatsa

Add the PCI IDs for U SKU IN CFL by following the spec.

v2: Update IDs

---
  intel/intel_chipset.h | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
intel/intel_chipset.h +0 -0
index 4da145c..8a0d4ff 100644

intel/intel_chipset.h line 234

Quoted 7 lines
intel/intel_chipset.h +4 -0
@@ -228,6 +228,10 @@
  #define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96
  #define PCI_CHIP_COFFEELAKE_H_GT2_1     0x3E9B
  #define PCI_CHIP_COFFEELAKE_H_GT2_2     0x3E94
+#define PCI_CHIP_COFFEELAKE_U_GT3_1     0x3EA5
+#define PCI_CHIP_COFFEELAKE_U_GT3_2     0x3EA6
+#define PCI_CHIP_COFFEELAKE_U_GT3_3     0x3EA7
+#define PCI_CHIP_COFFEELAKE_U_GT3_4     0x3EA8

Matches values in i915 driver.

Quoted 10 lines
intel/intel_chipset.h +1 -0
    #define IS_MOBILE(devid)    ((devid) == PCI_CHIP_I855_GM || \
                                 (devid) == PCI_CHIP_I915_GM || \
@@ -469,8 +473,14 @@
  #define IS_CFL_H(devid)         ((devid) == PCI_CHIP_COFFEELAKE_H_GT2_1
 || \
                                   (devid) == PCI_CHIP_COFFEELAKE_H_GT2_2)
  +#define IS_CFL_U(devid)         ((devid) == PCI_CHIP_COFFEELAKE_U_GT3_1
 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_2
 || \

intel/intel_chipset.h line 486

Quoted 10 lines
intel/intel_chipset.h +5 -1
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_3
 || \
+                                 (devid) == PCI_CHIP_COFFEELAKE_U_GT3_4)
+
  #define IS_COFFEELAKE(devid)   (IS_CFL_S(devid) || \
-                               IS_CFL_H(devid))
+                               IS_CFL_H(devid) || \
+                               IS_CFL_U(devid))
    #define IS_GEN9(devid)              (IS_SKYLAKE(devid)  || \
                                 IS_BROXTON(devid)  || \

_______________________________________________
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
Reviewed-by on v1 1/3
#8 lore raw
In reply to Anusha Srivatsa
Quoted 15 lines · Anusha Srivatsa

Add the PCI IDs for S SKU IN CFL by following the spec.

v2: Update IDs.

---
  intel/intel_chipset.h | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
intel/intel_chipset.h +0 -0
index 41fc0da..36bbec9 100644

intel/intel_chipset.h line 228

Quoted 8 lines
intel/intel_chipset.h +5 -0
@@ -221,6 +221,12 @@
  #define PCI_CHIP_GLK			0x3184
  #define PCI_CHIP_GLK_2X6		0x3185
 
+#define PCI_CHIP_COFFEELAKE_S_GT1_1     0x3E90
+#define PCI_CHIP_COFFEELAKE_S_GT1_2     0x3E93
+#define PCI_CHIP_COFFEELAKE_S_GT2_1     0x3E91
+#define PCI_CHIP_COFFEELAKE_S_GT2_2     0x3E92
+#define PCI_CHIP_COFFEELAKE_S_GT2_3     0x3E96

Matches BSPEC DID2 values.

Quoted 15 lines
intel/intel_chipset.h +8 -0
+
  #define IS_MOBILE(devid)	((devid) == PCI_CHIP_I855_GM || \
  				 (devid) == PCI_CHIP_I915_GM || \
  				 (devid) == PCI_CHIP_I945_GM || \
@@ -452,10 +458,19 @@
  #define IS_GEMINILAKE(devid)	((devid) == PCI_CHIP_GLK || \
  				 (devid) == PCI_CHIP_GLK_2X6)
 
+#define IS_CFL_S(devid)         ((devid) == PCI_CHIP_COFFEELAKE_S_GT1_1 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT1_2 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_1 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_2 || \
+                                (devid) == PCI_CHIP_COFFEELAKE_S_GT2_3 )
+
+#define IS_COFFEELAKE(devid)   (IS_CFL_S(devid))

intel/intel_chipset.h line 476

Quoted 10 lines
intel/intel_chipset.h +3 -1
+
  #define IS_GEN9(devid)		(IS_SKYLAKE(devid)  || \
  				 IS_BROXTON(devid)  || \
  				 IS_KABYLAKE(devid) || \
-				 IS_GEMINILAKE(devid))
+				 IS_GEMINILAKE(devid) || \
+				 IS_COFFEELAKE(devid))
 
  #define IS_9XX(dev)		(IS_GEN3(dev) || \
  				 IS_GEN4(dev) || \

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