[Intel-gfx] [PATCH ddx] Add Kabylake PCI IDs

[Chris Wilson]

On Mon, Oct 05, 2015 at 03:48:42PM -0700, Rodrigo Vivi wrote:
> Also, following kernel definition Kabylake is Skylake.

Wait for kernel inclusion, copy from kernel/i915_pciids.h and reference
upstream commit.

> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  src/i915_pciids.h  | 29 +++++++++++++++++++++++++++++
>  src/intel_module.c |  1 +
>  2 files changed, 30 insertions(+)
> 
> diff --git a/src/i915_pciids.h b/src/i915_pciids.h
> index 17c4456..9d76672 100644
> --- a/src/i915_pciids.h
> +++ b/src/i915_pciids.h
> @@ -286,6 +286,35 @@
>  	INTEL_SKL_GT2_IDS(info), \
>  	INTEL_SKL_GT3_IDS(info)
>  
> +#define INTEL_KBL_GT1_IDS(info)\
> +	INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5917, info), /* DT  GT1.5 */ \
> +	INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
> +	INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
> +	INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \
> +	INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
> +	INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
> +
> +#define INTEL_KBL_GT2_IDS(info)\
> +	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> +	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
> +	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
> +	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
> +	INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> +	INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> +	INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
> +
> +#define INTEL_KBL_GT3_IDS(info) \
> +	INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
> +	INTEL_VGA_DEVICE(0x592B, info), /* Halo GT3 */ \
> +	INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */
> +
> +#define INTEL_KBL_IDS(info) \
> +	INTEL_KBL_GT1_IDS(info), \
> +	INTEL_KBL_GT2_IDS(info), \
> +	INTEL_KBL_GT3_IDS(info)
> +
>  #define INTEL_BXT_IDS(info) \
>  	INTEL_VGA_DEVICE(0x0A84, info), \
>  	INTEL_VGA_DEVICE(0x1A84, info), \
> diff --git a/src/intel_module.c b/src/intel_module.c
> index d3dca83..6ebbf85 100644
> --- a/src/intel_module.c
> +++ b/src/intel_module.c
> @@ -326,6 +326,7 @@ static const struct pci_id_match intel_device_match[] = {
>  	INTEL_CHV_IDS(&intel_cherryview_info),
>  
>  	INTEL_SKL_IDS(&intel_skylake_info),
> +	INTEL_KBL_IDS(&intel_skylake_info),

Don't resuse skylake_info, but create kabylake_info with .gen=111;
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre