[Beignet] [PATCH] Runtime: Add SKL device id for new SKL device

[Yang, Rong R]

LGTM, pushed, thanks.

> -----Original Message-----
> From: Beignet [mailto:beignet-bounces at lists.freedesktop.org] On Behalf Of
> Xiuli Pan
> Sent: Friday, April 1, 2016 5:15
> To: beignet at lists.freedesktop.org
> Cc: intel at terre-adelie.org; Pan, Xiuli <xiuli.pan at intel.com>
> Subject: [Beignet] [PATCH] Runtime: Add SKL device id for new SKL device
> 
> From: Pan Xiuli <xiuli.pan at intel.com>
> 
> Add skylakd workstation device and desktop GT4
> 
> Signed-off-by: Pan Xiuli <xiuli.pan at intel.com>
> ---
>  src/cl_device_data.h | 16 ++++++++++++----
>  src/cl_device_id.c   |  8 ++++++++
>  2 files changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/src/cl_device_data.h b/src/cl_device_data.h index
> 63e078f..f789feb 100644
> --- a/src/cl_device_data.h
> +++ b/src/cl_device_data.h
> @@ -253,6 +253,7 @@
>  #define PCI_CHIP_SKYLAKE_ULX_GT2	0x191E   /* Intel(R) Skylake ULX - GT2
> */
>  #define PCI_CHIP_SKYLAKE_DT_GT1		0x1902   /* Intel(R) Skylake
> Desktop - GT1 */
>  #define PCI_CHIP_SKYLAKE_DT_GT2		0x1912   /* Intel(R) Skylake
> Desktop - GT2 */
> +#define PCI_CHIP_SKYLAKE_DT_GT4   0x1932   /* Intel(R) Skylake Desktop -
> GT4 */
>  #define PCI_CHIP_SKYLAKE_HALO_GT1 	0x190B   /* Intel(R) Skylake
> HALO - GT1 */
>  #define PCI_CHIP_SKYLAKE_HALO_GT2	0x191B   /* Intel(R) Skylake
> HALO - GT2 */
>  #define PCI_CHIP_SKYLAKE_HALO_GT3	0x192B   /* Intel(R) Skylake
> HALO - GT3 */
> @@ -261,6 +262,9 @@
>  #define PCI_CHIP_SKYLAKE_SRV_GT2	0x191A   /* Intel(R) Skylake Server -
> GT2 */
>  #define PCI_CHIP_SKYLAKE_SRV_GT3	0x192A   /* Intel(R) Skylake Server -
> GT3 */
>  #define PCI_CHIP_SKYLAKE_SRV_GT4	0x193A   /* Intel(R) Skylake Server -
> GT4 */
> +#define PCI_CHIP_SKYLAKE_WKS_GT2  0x191D   /* Intel(R) Skylake WKS -
> GT2 */
> +#define PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3  0x192D /* Intel(R) Skylake
> Media Server - GT3 */
> +#define PCI_CHIP_SKYLAKE_WKS_GT4  0x193D   /* Intel(R) Skylake WKS -
> GT4 */
> 
>  #define IS_SKL_GT1(devid)               \
>    (devid == PCI_CHIP_SKYLAKE_ULT_GT1 ||   \
> @@ -275,16 +279,20 @@
>     devid == PCI_CHIP_SKYLAKE_ULX_GT2 || \
>     devid == PCI_CHIP_SKYLAKE_DT_GT2 || \
>     devid == PCI_CHIP_SKYLAKE_HALO_GT2 || \
> -   devid == PCI_CHIP_SKYLAKE_SRV_GT2)
> +   devid == PCI_CHIP_SKYLAKE_SRV_GT2 || \
> +   devid == PCI_CHIP_SKYLAKE_WKS_GT2)
> 
>  #define IS_SKL_GT3(devid)               \
>    (devid == PCI_CHIP_SKYLAKE_ULT_GT3 ||   \
>     devid == PCI_CHIP_SKYLAKE_HALO_GT3 || \
> -   devid == PCI_CHIP_SKYLAKE_SRV_GT3)
> +   devid == PCI_CHIP_SKYLAKE_SRV_GT3 || \
> +   devid == PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3)
> 
>  #define IS_SKL_GT4(devid)               \
> -  (devid == PCI_CHIP_SKYLAKE_HALO_GT4 || \
> -   devid == PCI_CHIP_SKYLAKE_SRV_GT4)
> +  (devid == PCI_CHIP_SKYLAKE_DT_GT4 ||  \
> +   devid == PCI_CHIP_SKYLAKE_HALO_GT4 || \
> +   devid == PCI_CHIP_SKYLAKE_SRV_GT4 || \
> +   devid == PCI_CHIP_SKYLAKE_WKS_GT4)
> 
>  #define IS_SKYLAKE(devid) (IS_SKL_GT1(devid) || IS_SKL_GT2(devid) ||
> IS_SKL_GT3(devid) || IS_SKL_GT4(devid))
> 
> diff --git a/src/cl_device_id.c b/src/cl_device_id.c index c01e3d4..f8e06e2
> 100644
> --- a/src/cl_device_id.c
> +++ b/src/cl_device_id.c
> @@ -518,6 +518,8 @@ skl_gt1_break:
>        DECL_INFO_STRING(skl_gt2_break, intel_skl_gt2_device, name, "Intel(R)
> HD Graphics Skylake Halo GT2");
>      case PCI_CHIP_SKYLAKE_SRV_GT2:
>        DECL_INFO_STRING(skl_gt2_break, intel_skl_gt2_device, name, "Intel(R)
> HD Graphics Skylake Server GT2");
> +    case PCI_CHIP_SKYLAKE_WKS_GT2:
> +      DECL_INFO_STRING(skl_gt2_break, intel_skl_gt2_device, name,
> + "Intel(R) HD Graphics Skylake Workstation GT2");
>  skl_gt2_break:
>        intel_skl_gt2_device.device_id = device_id;
>        intel_skl_gt2_device.platform = cl_get_platform_default(); @@ -535,6
> +537,8 @@ skl_gt2_break:
>        DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R)
> HD Graphics Skylake Halo GT3");
>      case PCI_CHIP_SKYLAKE_SRV_GT3:
>        DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name, "Intel(R)
> HD Graphics Skylake Server GT3");
> +    case PCI_CHIP_SKYLAKE_MEDIA_SRV_GT3:
> +      DECL_INFO_STRING(skl_gt3_break, intel_skl_gt3_device, name,
> + "Intel(R) HD Graphics Skylake Media Server GT3");
>  skl_gt3_break:
>        intel_skl_gt3_device.device_id = device_id;
>        intel_skl_gt3_device.platform = cl_get_platform_default(); @@ -546,10
> +550,14 @@ skl_gt3_break:
>        cl_intel_platform_enable_extension(ret, cl_khr_fp16_ext_id);
>        break;
> 
> +    case PCI_CHIP_SKYLAKE_DT_GT4:
> +      DECL_INFO_STRING(skl_gt4_break, intel_skl_gt4_device, name,
> + "Intel(R) HD Graphics Skylake Desktop GT4");
>      case PCI_CHIP_SKYLAKE_HALO_GT4:
>        DECL_INFO_STRING(skl_gt4_break, intel_skl_gt4_device, name, "Intel(R)
> HD Graphics Skylake Halo GT4");
>      case PCI_CHIP_SKYLAKE_SRV_GT4:
>        DECL_INFO_STRING(skl_gt4_break, intel_skl_gt4_device, name, "Intel(R)
> HD Graphics Skylake Server GT4");
> +    case PCI_CHIP_SKYLAKE_WKS_GT4:
> +      DECL_INFO_STRING(skl_gt4_break, intel_skl_gt4_device, name,
> + "Intel(R) HD Graphics Skylake Workstation GT4");
>  skl_gt4_break:
>        intel_skl_gt4_device.device_id = device_id;
>        intel_skl_gt4_device.platform = cl_get_platform_default();
> --
> 2.5.0
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/beignet