[PATCH] drm/xe/ptl: Add missing device ID

[PATCH] drm/xe/ptl: Add missing device ID

[Tejas Upadhyay]

Probably during movement from xe_pciids.h to pciids.h PTL device id is missed.

Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
---
 include/drm/intel/pciids.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
index 32480b5563db..7883384acd5e 100644
--- a/include/drm/intel/pciids.h
+++ b/include/drm/intel/pciids.h
@@ -829,6 +829,7 @@
 	MACRO__(0xB092, ## __VA_ARGS__), \
 	MACRO__(0xB0A0, ## __VA_ARGS__), \
 	MACRO__(0xB0A1, ## __VA_ARGS__), \
-	MACRO__(0xB0A2, ## __VA_ARGS__)
+	MACRO__(0xB0A2, ## __VA_ARGS__), \
+	MACRO__(0xB0B0, ## __VA_ARGS__)
 
 #endif /* __PCIIDS_H__ */
-- 
2.34.1

✗ CI.Patch_applied: failure for drm/xe/ptl: Add missing device ID

[Patchwork]

== Series Details ==

Series: drm/xe/ptl: Add missing device ID
URL   : https://patchwork.freedesktop.org/series/142417/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 78bd7a249aa0 drm-tip: 2024y-12m-11d-14h-09m-32s UTC integration manifest
=== git am output follows ===
error: patch failed: include/drm/intel/pciids.h:829
error: include/drm/intel/pciids.h: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm/xe/ptl: Add missing device ID
Patch failed at 0001 drm/xe/ptl: Add missing device ID
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Re: [PATCH] drm/xe/ptl: Add missing device ID

[Rodrigo Vivi]

On Wed, Dec 11, 2024 at 07:43:06PM +0530, Tejas Upadhyay wrote:
> Probably during movement from xe_pciids.h to pciids.h PTL device id is missed.

Please check if this is indeed true and if true add this with certainty
and with a Fixes tag. Otherwise keep the message simply as
'Add a missing PCI ID' or 'Add a new PTL PCI ID'. Always imperative mode.

> 
> Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
> ---
>  include/drm/intel/pciids.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
> index 32480b5563db..7883384acd5e 100644
> --- a/include/drm/intel/pciids.h
> +++ b/include/drm/intel/pciids.h
> @@ -829,6 +829,7 @@
>  	MACRO__(0xB092, ## __VA_ARGS__), \
>  	MACRO__(0xB0A0, ## __VA_ARGS__), \
>  	MACRO__(0xB0A1, ## __VA_ARGS__), \
> -	MACRO__(0xB0A2, ## __VA_ARGS__)
> +	MACRO__(0xB0A2, ## __VA_ARGS__), \
> +	MACRO__(0xB0B0, ## __VA_ARGS__)
>  
>  #endif /* __PCIIDS_H__ */
> -- 
> 2.34.1
> 

RE: [PATCH] drm/xe/ptl: Add missing device ID

[Upadhyay, Tejas]

> -----Original Message-----
> From: Vivi, Rodrigo <rodrigo.vivi@intel.com>
> Sent: Wednesday, December 11, 2024 11:47 PM
> To: Upadhyay, Tejas <tejas.upadhyay@intel.com>
> Cc: intel-xe@lists.freedesktop.org
> Subject: Re: [PATCH] drm/xe/ptl: Add missing device ID
> 
> On Wed, Dec 11, 2024 at 07:43:06PM +0530, Tejas Upadhyay wrote:
> > Probably during movement from xe_pciids.h to pciids.h PTL device id is
> missed.
> 
> Please check if this is indeed true and if true add this with certainty and with
> a Fixes tag. Otherwise keep the message simply as 'Add a missing PCI ID' or
> 'Add a new PTL PCI ID'. Always imperative mode.

Yes for sure its missed. We used to have this PCIID in xe_pciids.h.
 
However, I just found out, drm-tip has this PCIID so probably some next backmerges will take care of this. Please, lets drop this patch.

Tejas 

> 
> >
> > Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
> > ---
> >  include/drm/intel/pciids.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
> > index 32480b5563db..7883384acd5e 100644
> > --- a/include/drm/intel/pciids.h
> > +++ b/include/drm/intel/pciids.h
> > @@ -829,6 +829,7 @@
> >  	MACRO__(0xB092, ## __VA_ARGS__), \
> >  	MACRO__(0xB0A0, ## __VA_ARGS__), \
> >  	MACRO__(0xB0A1, ## __VA_ARGS__), \
> > -	MACRO__(0xB0A2, ## __VA_ARGS__)
> > +	MACRO__(0xB0A2, ## __VA_ARGS__), \
> > +	MACRO__(0xB0B0, ## __VA_ARGS__)
> >
> >  #endif /* __PCIIDS_H__ */
> > --
> > 2.34.1
> >

RE: [PATCH] drm/xe/ptl: Add missing device ID

[Saarinen, Jani]

Hi, 
> -----Original Message-----
> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of Rodrigo
> Vivi
> Sent: Wednesday, 11 December 2024 20.17
> To: Upadhyay, Tejas <tejas.upadhyay@intel.com>
> Cc: intel-xe@lists.freedesktop.org
> Subject: Re: [PATCH] drm/xe/ptl: Add missing device ID
> 
> On Wed, Dec 11, 2024 at 07:43:06PM +0530, Tejas Upadhyay wrote:
> > Probably during movement from xe_pciids.h to pciids.h PTL device id is
> missed.
> 
> Please check if this is indeed true and if true add this with certainty and with a
> Fixes tag. Otherwise keep the message simply as 'Add a missing PCI ID' or 'Add
> a new PTL PCI ID'. Always imperative mode.

I see this is not true. They are there. Perhaps tree not updated as also building failed. 

Br,
Jani
> 
> >
> > Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
> > ---
> >  include/drm/intel/pciids.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
> > index 32480b5563db..7883384acd5e 100644
> > --- a/include/drm/intel/pciids.h
> > +++ b/include/drm/intel/pciids.h
> > @@ -829,6 +829,7 @@
> >  	MACRO__(0xB092, ## __VA_ARGS__), \
> >  	MACRO__(0xB0A0, ## __VA_ARGS__), \
> >  	MACRO__(0xB0A1, ## __VA_ARGS__), \
> > -	MACRO__(0xB0A2, ## __VA_ARGS__)
> > +	MACRO__(0xB0A2, ## __VA_ARGS__), \
> > +	MACRO__(0xB0B0, ## __VA_ARGS__)
> >
> >  #endif /* __PCIIDS_H__ */
> > --
> > 2.34.1
> >

Re: [PATCH] drm/xe/ptl: Add missing device ID

[Rodrigo Vivi]

On Wed, Dec 11, 2024 at 01:52:37PM -0500, Upadhyay, Tejas wrote:
> 
> 
> > -----Original Message-----
> > From: Vivi, Rodrigo <rodrigo.vivi@intel.com>
> > Sent: Wednesday, December 11, 2024 11:47 PM
> > To: Upadhyay, Tejas <tejas.upadhyay@intel.com>
> > Cc: intel-xe@lists.freedesktop.org
> > Subject: Re: [PATCH] drm/xe/ptl: Add missing device ID
> > 
> > On Wed, Dec 11, 2024 at 07:43:06PM +0530, Tejas Upadhyay wrote:
> > > Probably during movement from xe_pciids.h to pciids.h PTL device id is
> > missed.
> > 
> > Please check if this is indeed true and if true add this with certainty and with
> > a Fixes tag. Otherwise keep the message simply as 'Add a missing PCI ID' or
> > 'Add a new PTL PCI ID'. Always imperative mode.
> 
> Yes for sure its missed. We used to have this PCIID in xe_pciids.h.
>  
> However, I just found out, drm-tip has this PCIID so probably some next backmerges will take care of this. Please, lets drop this patch.

Indeed:

ae78ec0a52c4 ("drm/xe/ptl: Add another PTL PCI ID")
drm-xe-next
CommitDate: Fri Nov 22 13:58:13 2024 -0800


> 
> Tejas 
> 
> > 
> > >
> > > Signed-off-by: Tejas Upadhyay <tejas.upadhyay@intel.com>
> > > ---
> > >  include/drm/intel/pciids.h | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h
> > > index 32480b5563db..7883384acd5e 100644
> > > --- a/include/drm/intel/pciids.h
> > > +++ b/include/drm/intel/pciids.h
> > > @@ -829,6 +829,7 @@
> > >  	MACRO__(0xB092, ## __VA_ARGS__), \
> > >  	MACRO__(0xB0A0, ## __VA_ARGS__), \
> > >  	MACRO__(0xB0A1, ## __VA_ARGS__), \
> > > -	MACRO__(0xB0A2, ## __VA_ARGS__)
> > > +	MACRO__(0xB0A2, ## __VA_ARGS__), \
> > > +	MACRO__(0xB0B0, ## __VA_ARGS__)
> > >
> > >  #endif /* __PCIIDS_H__ */
> > > --
> > > 2.34.1
> > >