Re: [PATCH 2/3] drm/xe/pciids: Add PVC's PCI device ID macros

[Jani Nikula <jani.nikula@intel.com>]

On Fri, 06 Sep 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Fri, Sep 06, 2024 at 03:06:03PM +0300, Jani Nikula wrote:
>> From: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> 
>> Add PVC PCI IDs to the xe_pciids.h header. They're not yet used in the
>> driver.
>> 
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
>> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> 
>> ---
>> 
>> This is for drm-xe-next. Functionally, having the PCI IDs defined
>> doesn't mean anything, but it's easier all around to not carry these in
>> xe-for-CI.
>
> Cc: Simona Vetter <simona.vetter@ffwll.ch>
>
> either way works for me. I believe that recently we got more conflicts
> on the other file, then in this one here. But I believe it makes
> more sense this way since this file can be more cleanly synced in IGT...
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

I merged this one to drm-xe-next with Sima's IRC ack.

The drm-tip rebuild works, and handles the merge just fine. But I can't
apply patches 1 and 3 to topic/xe-for-CI, because it won't build
standalone. It needs a rebase on drm-xe-next, but I can't push that:

remote: GitLab: You are not allowed to force push code to a protected branch on this project.
To ssh://gitlab.freedesktop.org/drm/xe/kernel.git
 ! [remote rejected]           topic/xe-for-CI -> topic/xe-for-CI (pre-receive hook declined)
error: failed to push some refs to 'ssh://gitlab.freedesktop.org/drm/xe/kernel.git'

I'll have to leave the cleanup to you.

BR,
Jani.


>
>> ---
>>  include/drm/intel/xe_pciids.h | 16 ++++++++++++++++
>>  1 file changed, 16 insertions(+)
>> 
>> diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h
>> index 644872a35c35..73d972a8aca1 100644
>> --- a/include/drm/intel/xe_pciids.h
>> +++ b/include/drm/intel/xe_pciids.h
>> @@ -187,6 +187,22 @@
>>  	MACRO__(0x7DD1, ## __VA_ARGS__),        \
>>  	MACRO__(0x7DD5, ## __VA_ARGS__)
>>  
>> +/* PVC */
>> +#define XE_PVC_IDS(MACRO__, ...)		\
>> +	MACRO__(0x0B69, ## __VA_ARGS__),	\
>> +	MACRO__(0x0B6E, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD4, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD5, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD6, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD7, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD8, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BD9, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BDA, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BDB, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BE0, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BE1, ## __VA_ARGS__),	\
>> +	MACRO__(0x0BE5, ## __VA_ARGS__)
>> +
>>  #define XE_LNL_IDS(MACRO__, ...) \
>>  	MACRO__(0x6420, ## __VA_ARGS__), \
>>  	MACRO__(0x64A0, ## __VA_ARGS__), \
>> -- 
>> 2.39.2
>> 

-- 
Jani Nikula, Intel