[Intel-gfx] [PATCH 1/2] drm/i915/cml: Add CML PCI IDS

[Rodrigo Vivi]

On Mon, Mar 04, 2019 at 03:06:04PM -0800, Anusha wrote:
> From: Anusha Srivatsa <anusha.srivatsa at intel.com>
> 
> Comet Lake is a Intel Processor containing Gen9
> Intel HD Graphics. This patch adds the initial set of
> PCI IDs. Comet Lake comes off of Coffee Lake - adding
> the IDs to Coffee Lake ID list.
> 
> More support and features will be in the patches that follow.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c |  5 +++++
>  include/drm/i915_pciids.h       | 24 +++++++++++++++++++++++-
>  2 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index a9211c370cd1..71427bd19913 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -615,6 +615,10 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
>  	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
>  };
>  
> +static const struct intel_device_info intel_cometlake_info = {
> +	CFL_PLATFORM,
> +};

I'm really sorry for not having spotted this earlier on internal
version that I also carried. :(

But it is missing .gt = here

But I don't believe we need to add this intel_commetlake_info,
but just reuse intel_coffeelake_gt2_info like we did for WHL and AML.

> +
>  #define GEN10_FEATURES \
>  	GEN9_FEATURES, \
>  	GEN(10), \
> @@ -723,6 +727,7 @@ static const struct pci_device_id pciidlist[] = {
>  	INTEL_WHL_U_GT2_IDS(&intel_coffeelake_gt2_info),
>  	INTEL_AML_CFL_GT2_IDS(&intel_coffeelake_gt2_info),
>  	INTEL_WHL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> +	INTEL_CML_IDS(&intel_cometlake_info),
>  	INTEL_CNL_IDS(&intel_cannonlake_info),
>  	INTEL_ICL_11_IDS(&intel_icelake_11_info),
>  	{0, 0, 0}
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index d2fad7b0fcf6..78c74df552cb 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -373,6 +373,27 @@
>  #define INTEL_AML_CFL_GT2_IDS(info) \
>  	INTEL_VGA_DEVICE(0x87CA, info)
>  
> +/* CML */
> +#define INTEL_CML_IDS(info) \
> +	INTEL_VGA_DEVICE(0x9BC1, info), \
> +	INTEL_VGA_DEVICE(0x9BA1, info), \
> +	INTEL_VGA_DEVICE(0x9BCA, info), \
> +	INTEL_VGA_DEVICE(0x9BAA, info), \
> +	INTEL_VGA_DEVICE(0x9BCB, info), \
> +	INTEL_VGA_DEVICE(0x9BAB, info), \
> +	INTEL_VGA_DEVICE(0x9BCC, info), \
> +	INTEL_VGA_DEVICE(0x9BAC, info), \
> +	INTEL_VGA_DEVICE(0x9BC0, info), \
> +	INTEL_VGA_DEVICE(0x9BA0, info), \
> +	INTEL_VGA_DEVICE(0x9BC5, info), \
> +	INTEL_VGA_DEVICE(0x9BA5, info), \
> +	INTEL_VGA_DEVICE(0x9BC8, info), \
> +	INTEL_VGA_DEVICE(0x9BA8, info), \
> +	INTEL_VGA_DEVICE(0x9BC4, info), \
> +	INTEL_VGA_DEVICE(0x9BA4, info), \
> +	INTEL_VGA_DEVICE(0x9BC2, info), \
> +	INTEL_VGA_DEVICE(0x9BA2, info)

It's impressive how much and fast this spec page changed,
but with new page it was easier to see gt1 vs gt2 hence
I noticed the missing .gt :/

IDs here are matching the latest spec, but we will need
some split for

&intel_coffeelake_gt1_info

and

&intel_coffeelake_gt2_info

Thanks,
Rodrigo.

> +
>  #define INTEL_KBL_IDS(info) \
>  	INTEL_KBL_GT1_IDS(info), \
>  	INTEL_KBL_GT2_IDS(info), \
> @@ -436,7 +457,8 @@
>  	INTEL_WHL_U_GT1_IDS(info), \
>  	INTEL_WHL_U_GT2_IDS(info), \
>  	INTEL_WHL_U_GT3_IDS(info), \
> -	INTEL_AML_CFL_GT2_IDS(info)
> +	INTEL_AML_CFL_GT2_IDS(info), \
> +	INTEL_CML_IDS(info)
>  
>  /* CNL */
>  #define INTEL_CNL_IDS(info) \
> -- 
> 2.21.0
>