On Wed, 2019-03-13 at 14:11 -0700, Rodrigo Vivi wrote:
> From: James Ausmus <james.ausmus@intel.com>
> 
> Add known EHL PCI IDs.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> 
> Cc: Bob Paauwe <bob.j.paauwe@intel.com>
> Signed-off-by: James Ausmus <james.ausmus@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  arch/x86/kernel/early-quirks.c  | 1 +
>  drivers/gpu/drm/i915/i915_pci.c | 9 +++++++++
>  include/drm/i915_pciids.h       | 7 +++++++
>  3 files changed, 17 insertions(+)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-
> quirks.c
> index 50d5848bf22e..a8d2cde67c41 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -547,6 +547,7 @@ static const struct pci_device_id
> intel_early_ids[] __initconst = {
>  	INTEL_GLK_IDS(&gen9_early_ops),
>  	INTEL_CNL_IDS(&gen9_early_ops),
>  	INTEL_ICL_11_IDS(&gen11_early_ops),
> +	INTEL_EHL_IDS(&gen11_early_ops),
>  };
>  
>  struct resource intel_graphics_stolen_res __ro_after_init =
> DEFINE_RES_MEM(0, 0);
> diff --git a/drivers/gpu/drm/i915/i915_pci.c
> b/drivers/gpu/drm/i915/i915_pci.c
> index 3cf697e8f1fa..d4d3a904950c 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -724,6 +724,14 @@ static const struct intel_device_info
> intel_icelake_11_info = {
>  		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) |
> BIT(VCS2),
>  };
>  
> +static const struct intel_device_info intel_elkhartlake_info = {
> +	GEN11_FEATURES,
> +	PLATFORM(INTEL_ICELAKE),
> +	.num_pipes = 3,
> +	.is_alpha_support = 1,
> +	.engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VCS0),
> +};
> +
>  #undef GEN
>  #undef PLATFORM
>  
> @@ -791,6 +799,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
>  	INTEL_CNL_IDS(&intel_cannonlake_info),
>  	INTEL_ICL_11_IDS(&intel_icelake_11_info),
> +	INTEL_EHL_IDS(&intel_elkhartlake_info),
>  	{0, 0, 0}
>  };
>  MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index d200000feeaa..a0e409e9e70d 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -472,4 +472,11 @@
>  	INTEL_VGA_DEVICE(0x8A70, info), \
>  	INTEL_VGA_DEVICE(0x8A53, info)
>  
> +/* EHL */
> +#define INTEL_EHL_IDS(info) \
> +	INTEL_VGA_DEVICE(0x4500, info),	\
> +	INTEL_VGA_DEVICE(0x4571, info), \
> +	INTEL_VGA_DEVICE(0x4551, info), \
> +	INTEL_VGA_DEVICE(0x4541, info)
> +
>  #endif /* _I915_PCIIDS_H */