diff mbox

[v2] intel: Add missing SKL device IDs

Message ID 1455666165-29646-1-git-send-email-benjamin.widawsky@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ben Widawsky Feb. 16, 2016, 11:42 p.m. UTC
A new list yielded new devices that apparently have shipped, or will ship.

v2: I can't read. 0x192d is GT3

Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
---
 intel/intel_chipset.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Ben Widawsky Feb. 17, 2016, 3:31 a.m. UTC | #1
On Tue, Feb 16, 2016 at 03:42:45PM -0800, Ben Widawsky wrote:
> A new list yielded new devices that apparently have shipped, or will ship.
> 
> v2: I can't read. 0x192d is GT3
> 
> Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
> ---
>  intel/intel_chipset.h | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
> index 35148e5..9c24701 100644
> --- a/intel/intel_chipset.h
> +++ b/intel/intel_chipset.h
> @@ -168,6 +168,7 @@
>  #define PCI_CHIP_SKYLAKE_DT_GT1		0x1902
>  #define PCI_CHIP_SKYLAKE_ULT_GT1	0x1906
>  #define PCI_CHIP_SKYLAKE_SRV_GT1	0x190A /* Reserved */
> +#define PCI_CHIP_SKYLAKE_H_GT1		0x190B
>  #define PCI_CHIP_SKYLAKE_ULX_GT1	0x190E /* Reserved */
>  #define PCI_CHIP_SKYLAKE_DT_GT2		0x1912
>  #define PCI_CHIP_SKYLAKE_FUSED0_GT2	0x1913 /* Reserved */
> @@ -182,6 +183,7 @@
>  #define PCI_CHIP_SKYLAKE_GT3		0x1926
>  #define PCI_CHIP_SKYLAKE_HALO_GT3	0x192B /* Reserved */
>  #define PCI_CHIP_SKYLAKE_SRV_GT4	0x192A
> +#define PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3	0x192D
>  #define PCI_CHIP_SKYLAKE_DT_GT4		0x1932
>  #define PCI_CHIP_SKYLAKE_SRV_GT4X	0x193A
>  #define PCI_CHIP_SKYLAKE_H_GT4		0x193B
> @@ -376,7 +378,8 @@
>  #define IS_SKL_GT1(devid)	((devid) == PCI_CHIP_SKYLAKE_ULT_GT1	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_ULX_GT1	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_DT_GT1	|| \
> -				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT1)
> +				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT1	|| \
> +				 (devid) == PCI_CHIP_SKYLAKE_H_GT1)
>  
>  #define IS_SKL_GT2(devid)	((devid) == PCI_CHIP_SKYLAKE_DT_GT2	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_FUSED0_GT2	|| \
> @@ -390,13 +393,15 @@
>  				 (devid) == PCI_CHIP_SKYLAKE_MOBILE_GT2)
>  
>  #define IS_SKL_GT3(devid)	((devid) == PCI_CHIP_SKYLAKE_GT3	|| \
> -				 (devid) == PCI_CHIP_SKYLAKE_HALO_GT3)
> +				 (devid) == PCI_CHIP_SKYLAKE_HALO_GT3   || \
> +				 (devid) == PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3)
> +
>  
>  #define IS_SKL_GT4(devid)	((devid) == PCI_CHIP_SKYLAKE_SRV_GT4	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_DT_GT4	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT4X	|| \
>  				 (devid) == PCI_CHIP_SKYLAKE_H_GT4	|| \
> -				 (devid) == PCI_CHIP_SKYLAKE_WKS_GT4)
> +				 (devid) == PCI_CHIP_SKYLAKE_WKS_GT4    || \

Really sloppy on my part... This hunk is gone from my local patch. I'm not even
sure really how I sent this out...

>  
>  #define IS_KBL_GT1(devid)	((devid) == PCI_CHIP_KABYLAKE_ULT_GT1_5	|| \
>  				 (devid) == PCI_CHIP_KABYLAKE_ULX_GT1_5	|| \
> -- 
> 2.7.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
diff mbox

Patch

diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
index 35148e5..9c24701 100644
--- a/intel/intel_chipset.h
+++ b/intel/intel_chipset.h
@@ -168,6 +168,7 @@ 
 #define PCI_CHIP_SKYLAKE_DT_GT1		0x1902
 #define PCI_CHIP_SKYLAKE_ULT_GT1	0x1906
 #define PCI_CHIP_SKYLAKE_SRV_GT1	0x190A /* Reserved */
+#define PCI_CHIP_SKYLAKE_H_GT1		0x190B
 #define PCI_CHIP_SKYLAKE_ULX_GT1	0x190E /* Reserved */
 #define PCI_CHIP_SKYLAKE_DT_GT2		0x1912
 #define PCI_CHIP_SKYLAKE_FUSED0_GT2	0x1913 /* Reserved */
@@ -182,6 +183,7 @@ 
 #define PCI_CHIP_SKYLAKE_GT3		0x1926
 #define PCI_CHIP_SKYLAKE_HALO_GT3	0x192B /* Reserved */
 #define PCI_CHIP_SKYLAKE_SRV_GT4	0x192A
+#define PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3	0x192D
 #define PCI_CHIP_SKYLAKE_DT_GT4		0x1932
 #define PCI_CHIP_SKYLAKE_SRV_GT4X	0x193A
 #define PCI_CHIP_SKYLAKE_H_GT4		0x193B
@@ -376,7 +378,8 @@ 
 #define IS_SKL_GT1(devid)	((devid) == PCI_CHIP_SKYLAKE_ULT_GT1	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_ULX_GT1	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_DT_GT1	|| \
-				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT1)
+				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT1	|| \
+				 (devid) == PCI_CHIP_SKYLAKE_H_GT1)
 
 #define IS_SKL_GT2(devid)	((devid) == PCI_CHIP_SKYLAKE_DT_GT2	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_FUSED0_GT2	|| \
@@ -390,13 +393,15 @@ 
 				 (devid) == PCI_CHIP_SKYLAKE_MOBILE_GT2)
 
 #define IS_SKL_GT3(devid)	((devid) == PCI_CHIP_SKYLAKE_GT3	|| \
-				 (devid) == PCI_CHIP_SKYLAKE_HALO_GT3)
+				 (devid) == PCI_CHIP_SKYLAKE_HALO_GT3   || \
+				 (devid) == PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3)
+
 
 #define IS_SKL_GT4(devid)	((devid) == PCI_CHIP_SKYLAKE_SRV_GT4	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_DT_GT4	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_SRV_GT4X	|| \
 				 (devid) == PCI_CHIP_SKYLAKE_H_GT4	|| \
-				 (devid) == PCI_CHIP_SKYLAKE_WKS_GT4)
+				 (devid) == PCI_CHIP_SKYLAKE_WKS_GT4    || \
 
 #define IS_KBL_GT1(devid)	((devid) == PCI_CHIP_KABYLAKE_ULT_GT1_5	|| \
 				 (devid) == PCI_CHIP_KABYLAKE_ULX_GT1_5	|| \