diff mbox

[02/27] drm/i915/icl: Add the ICL PCI IDs

Message ID 20180109232336.11029-3-paulo.r.zanoni@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Zanoni, Paulo R Jan. 9, 2018, 11:23 p.m. UTC 
This is the current PCI ID list in our documentation.

Let's leave the _gt#_ part out for now since our current documentation
is not 100% clear and we don't need this info now anyway.

v2: Use the new ICL_11 naming (Kelvin Gardiner).
v3: Latest IDs as per BSpec (Oscar).
v4: Make it compile (Paulo).
v5: Remove comments (Lucas).
v6: Multile rebases (Paulo).

Reviewed-by: Anuj Phogat <anuj.phogat@intel.com> (v1)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c |  1 +
 include/drm/i915_pciids.h       | 11 +++++++++++
 2 files changed, 12 insertions(+)

Comments

oscar.mateo@intel.com Jan. 10, 2018, 12:09 a.m. UTC | #1 
On 01/09/2018 03:23 PM, Paulo Zanoni wrote:
> This is the current PCI ID list in our documentation.
>
> Let's leave the _gt#_ part out for now since our current documentation
> is not 100% clear and we don't need this info now anyway.
>
> v2: Use the new ICL_11 naming (Kelvin Gardiner).
> v3: Latest IDs as per BSpec (Oscar).
> v4: Make it compile (Paulo).
> v5: Remove comments (Lucas).
> v6: Multile rebases (Paulo).
>
> Reviewed-by: Anuj Phogat <anuj.phogat@intel.com> (v1)
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_pci.c |  1 +
>   include/drm/i915_pciids.h       | 11 +++++++++++
>   2 files changed, 12 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 88cd4a3b12f5..0a807bb44583 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {
>   	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
>   	INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
>   	INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
> +	INTEL_ICL_11_IDS(&intel_icelake_11_info),
>   	{0, 0, 0}
>   };

And apparently the latest trend here is to add the GT info (as per a 
patch from Lionel) which we are also not doing in ICL yet.
>   MODULE_DEVICE_TABLE(pci, pciidlist);
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 5db0458dd832..a967fa3838fb 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -434,4 +434,15 @@
>   	INTEL_CNL_U_GT2_IDS(info), \
>   	INTEL_CNL_Y_GT2_IDS(info)
>   
> +#define INTEL_ICL_11_IDS(info) \
> +	INTEL_VGA_DEVICE(0x8A50, info), \
> +	INTEL_VGA_DEVICE(0x8A51, info), \
> +	INTEL_VGA_DEVICE(0x8A5C, info), \
> +	INTEL_VGA_DEVICE(0x8A5D, info), \
> +	INTEL_VGA_DEVICE(0x8A52, info), \
> +	INTEL_VGA_DEVICE(0x8A5A, info), \
> +	INTEL_VGA_DEVICE(0x8A5B, info), \
> +	INTEL_VGA_DEVICE(0x8A71, info), \
> +	INTEL_VGA_DEVICE(0x8A70, info)
> +
>   #endif /* _I915_PCIIDS_H */
Lucas De Marchi Jan. 10, 2018, 1:02 a.m. UTC | #2 
On Tue, 2018-01-09 at 16:09 -0800, Oscar Mateo wrote:
> 

> On 01/09/2018 03:23 PM, Paulo Zanoni wrote:

> > This is the current PCI ID list in our documentation.

> > 

> > Let's leave the _gt#_ part out for now since our current documentation

> > is not 100% clear and we don't need this info now anyway.

> > 

> > v2: Use the new ICL_11 naming (Kelvin Gardiner).

> > v3: Latest IDs as per BSpec (Oscar).

> > v4: Make it compile (Paulo).

> > v5: Remove comments (Lucas).

> > v6: Multile rebases (Paulo).

> > 

> > Reviewed-by: Anuj Phogat <anuj.phogat@intel.com> (v1)

> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

> > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>

> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> > ---

> >   drivers/gpu/drm/i915/i915_pci.c |  1 +

> >   include/drm/i915_pciids.h       | 11 +++++++++++

> >   2 files changed, 12 insertions(+)

> > 

> > diff --git a/drivers/gpu/drm/i915/i915_pci.c

> > b/drivers/gpu/drm/i915/i915_pci.c

> > index 88cd4a3b12f5..0a807bb44583 100644

> > --- a/drivers/gpu/drm/i915/i915_pci.c

> > +++ b/drivers/gpu/drm/i915/i915_pci.c

> > @@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {

> >   	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),

> >   	INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),

> >   	INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),

> > +	INTEL_ICL_11_IDS(&intel_icelake_11_info),

> >   	{0, 0, 0}

> >   };

> 

> And apparently the latest trend here is to add the GT info (as per a 

> patch from Lionel) which we are also not doing in ICL yet.


With a reason... that I think is well explained in the commit message, isn't
it?


Lucas De Marchi

> >   MODULE_DEVICE_TABLE(pci, pciidlist);

> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h

> > index 5db0458dd832..a967fa3838fb 100644

> > --- a/include/drm/i915_pciids.h

> > +++ b/include/drm/i915_pciids.h

> > @@ -434,4 +434,15 @@

> >   	INTEL_CNL_U_GT2_IDS(info), \

> >   	INTEL_CNL_Y_GT2_IDS(info)

> >   

> > +#define INTEL_ICL_11_IDS(info) \

> > +	INTEL_VGA_DEVICE(0x8A50, info), \

> > +	INTEL_VGA_DEVICE(0x8A51, info), \

> > +	INTEL_VGA_DEVICE(0x8A5C, info), \

> > +	INTEL_VGA_DEVICE(0x8A5D, info), \

> > +	INTEL_VGA_DEVICE(0x8A52, info), \

> > +	INTEL_VGA_DEVICE(0x8A5A, info), \

> > +	INTEL_VGA_DEVICE(0x8A5B, info), \

> > +	INTEL_VGA_DEVICE(0x8A71, info), \

> > +	INTEL_VGA_DEVICE(0x8A70, info)

> > +

> >   #endif /* _I915_PCIIDS_H */

> 

>
oscar.mateo@intel.com Jan. 10, 2018, 1:07 a.m. UTC | #3 
On 01/09/2018 05:02 PM, De Marchi, Lucas wrote:
> On Tue, 2018-01-09 at 16:09 -0800, Oscar Mateo wrote:
>> On 01/09/2018 03:23 PM, Paulo Zanoni wrote:
>>> This is the current PCI ID list in our documentation.
>>>
>>> Let's leave the _gt#_ part out for now since our current documentation
>>> is not 100% clear and we don't need this info now anyway.
>>>
>>> v2: Use the new ICL_11 naming (Kelvin Gardiner).
>>> v3: Latest IDs as per BSpec (Oscar).
>>> v4: Make it compile (Paulo).
>>> v5: Remove comments (Lucas).
>>> v6: Multile rebases (Paulo).
>>>
>>> Reviewed-by: Anuj Phogat <anuj.phogat@intel.com> (v1)
>>> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
>>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> ---
>>>    drivers/gpu/drm/i915/i915_pci.c |  1 +
>>>    include/drm/i915_pciids.h       | 11 +++++++++++
>>>    2 files changed, 12 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_pci.c
>>> b/drivers/gpu/drm/i915/i915_pci.c
>>> index 88cd4a3b12f5..0a807bb44583 100644
>>> --- a/drivers/gpu/drm/i915/i915_pci.c
>>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>>> @@ -651,6 +651,7 @@ static const struct pci_device_id pciidlist[] = {
>>>    	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
>>>    	INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
>>>    	INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
>>> +	INTEL_ICL_11_IDS(&intel_icelake_11_info),
>>>    	{0, 0, 0}
>>>    };
>> And apparently the latest trend here is to add the GT info (as per a
>> patch from Lionel) which we are also not doing in ICL yet.
> With a reason... that I think is well explained in the commit message, isn't
> it?
>

Yeah, I just saw that warning in the commit message (right when I was 
wondering how to represent a GT 0.5...). Paulo: are we still happy with 
this patch as is? Also: do we want to split the table into Y & U skus 
like CNL does now?

> Lucas De Marchi
>
>>>    MODULE_DEVICE_TABLE(pci, pciidlist);
>>> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
>>> index 5db0458dd832..a967fa3838fb 100644
>>> --- a/include/drm/i915_pciids.h
>>> +++ b/include/drm/i915_pciids.h
>>> @@ -434,4 +434,15 @@
>>>    	INTEL_CNL_U_GT2_IDS(info), \
>>>    	INTEL_CNL_Y_GT2_IDS(info)
>>>    
>>> +#define INTEL_ICL_11_IDS(info) \
>>> +	INTEL_VGA_DEVICE(0x8A50, info), \
>>> +	INTEL_VGA_DEVICE(0x8A51, info), \
>>> +	INTEL_VGA_DEVICE(0x8A5C, info), \
>>> +	INTEL_VGA_DEVICE(0x8A5D, info), \
>>> +	INTEL_VGA_DEVICE(0x8A52, info), \
>>> +	INTEL_VGA_DEVICE(0x8A5A, info), \
>>> +	INTEL_VGA_DEVICE(0x8A5B, info), \
>>> +	INTEL_VGA_DEVICE(0x8A71, info), \
>>> +	INTEL_VGA_DEVICE(0x8A70, info)
>>> +
>>>    #endif /* _I915_PCIIDS_H */
Zanoni, Paulo R Jan. 10, 2018, 2:08 p.m. UTC | #4 
Em Ter, 2018-01-09 às 17:07 -0800, Oscar Mateo escreveu:
> 
> On 01/09/2018 05:02 PM, De Marchi, Lucas wrote:
> > On Tue, 2018-01-09 at 16:09 -0800, Oscar Mateo wrote:
> > > On 01/09/2018 03:23 PM, Paulo Zanoni wrote:
> > > > This is the current PCI ID list in our documentation.
> > > > 
> > > > Let's leave the _gt#_ part out for now since our current
> > > > documentation
> > > > is not 100% clear and we don't need this info now anyway.
> > > > 
> > > > v2: Use the new ICL_11 naming (Kelvin Gardiner).
> > > > v3: Latest IDs as per BSpec (Oscar).
> > > > v4: Make it compile (Paulo).
> > > > v5: Remove comments (Lucas).
> > > > v6: Multile rebases (Paulo).
> > > > 
> > > > Reviewed-by: Anuj Phogat <anuj.phogat@intel.com> (v1)
> > > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> > > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > ---
> > > >    drivers/gpu/drm/i915/i915_pci.c |  1 +
> > > >    include/drm/i915_pciids.h       | 11 +++++++++++
> > > >    2 files changed, 12 insertions(+)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c
> > > > b/drivers/gpu/drm/i915/i915_pci.c
> > > > index 88cd4a3b12f5..0a807bb44583 100644
> > > > --- a/drivers/gpu/drm/i915/i915_pci.c
> > > > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > > > @@ -651,6 +651,7 @@ static const struct pci_device_id
> > > > pciidlist[] = {
> > > >    	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
> > > >    	INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
> > > >    	INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
> > > > +	INTEL_ICL_11_IDS(&intel_icelake_11_info),
> > > >    	{0, 0, 0}
> > > >    };
> > > 
> > > And apparently the latest trend here is to add the GT info (as
> > > per a
> > > patch from Lionel) which we are also not doing in ICL yet.
> > 
> > With a reason... that I think is well explained in the commit
> > message, isn't
> > it?
> > 
> 
> Yeah, I just saw that warning in the commit message (right when I
> was 
> wondering how to represent a GT 0.5...). Paulo: are we still happy
> with 
> this patch as is?

Well, I am :).


> Also: do we want to split the table into Y & U skus 
> like CNL does now?

There's a CNL patch from Rodrigo unsplitting the Y&U thing.


> 
> > Lucas De Marchi
> > 
> > > >    MODULE_DEVICE_TABLE(pci, pciidlist);
> > > > diff --git a/include/drm/i915_pciids.h
> > > > b/include/drm/i915_pciids.h
> > > > index 5db0458dd832..a967fa3838fb 100644
> > > > --- a/include/drm/i915_pciids.h
> > > > +++ b/include/drm/i915_pciids.h
> > > > @@ -434,4 +434,15 @@
> > > >    	INTEL_CNL_U_GT2_IDS(info), \
> > > >    	INTEL_CNL_Y_GT2_IDS(info)
> > > >    
> > > > +#define INTEL_ICL_11_IDS(info) \
> > > > +	INTEL_VGA_DEVICE(0x8A50, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A51, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A5C, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A5D, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A52, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A5A, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A5B, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A71, info), \
> > > > +	INTEL_VGA_DEVICE(0x8A70, info)
> > > > +
> > > >    #endif /* _I915_PCIIDS_H */
> 
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 88cd4a3b12f5..0a807bb44583 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -651,6 +651,7 @@  static const struct pci_device_id pciidlist[] = {
 	INTEL_CFL_U_GT3_IDS(&intel_coffeelake_gt3_info),
 	INTEL_CNL_U_GT2_IDS(&intel_cannonlake_gt2_info),
 	INTEL_CNL_Y_GT2_IDS(&intel_cannonlake_gt2_info),
+	INTEL_ICL_11_IDS(&intel_icelake_11_info),
 	{0, 0, 0}
 };
 MODULE_DEVICE_TABLE(pci, pciidlist);
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 5db0458dd832..a967fa3838fb 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -434,4 +434,15 @@ 
 	INTEL_CNL_U_GT2_IDS(info), \
 	INTEL_CNL_Y_GT2_IDS(info)
 
+#define INTEL_ICL_11_IDS(info) \
+	INTEL_VGA_DEVICE(0x8A50, info), \
+	INTEL_VGA_DEVICE(0x8A51, info), \
+	INTEL_VGA_DEVICE(0x8A5C, info), \
+	INTEL_VGA_DEVICE(0x8A5D, info), \
+	INTEL_VGA_DEVICE(0x8A52, info), \
+	INTEL_VGA_DEVICE(0x8A5A, info), \
+	INTEL_VGA_DEVICE(0x8A5B, info), \
+	INTEL_VGA_DEVICE(0x8A71, info), \
+	INTEL_VGA_DEVICE(0x8A70, info)
+
 #endif /* _I915_PCIIDS_H */