Re: [PATCH 0/3] [drm-xe:topic/xe-for-CI] Use GuC firmware 70.68.0 for pre-release platforms.

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Thu, Jun 04, 2026 at 01:51:35PM -0700, Julia Filipchuk wrote:
> Use GuC version 70.68.0 for NVL-S, CRI, NVL-P.
> 
> Patches are intended to be merged into drm-xe:/topic/xe-for-CI branch.

Pushed, thanks for the updates.

for the record, the other approach with the revert + new patch is easier.

So the maintainer can just:

$ b4 <header>
$ git rebase -i <somehash>
# Remove original patches and revert
$ dim push -f

The fixup flow is something like:

$ b4 <header>
$ git rebase -i --autosquash <somehash>
# Fix each patch conflict;

# For each patch:
$ git rebase --continue

$ dim push

For me it was simple because I use a git-truce wiggle based script to deal
with conflicts and easy obvious conflicts like that it is just to

$ b4 <header>
$ git rebase -i --autosquash <somehash>

# For each patch:
$ git-truce
$ git rebase --continue

$ dim push

But as I told, just for the record. It was easy to me.
Thanks for doing the hardest part and the diligence with the validation and all!

Thanks,
Rodrigo.

> 
> Platforms NVL-S, CRI, NVL-P are not merged to upstream at present. The
> GuC definitions for those only exist in the for-ci topic branch
> drm-xe:topic/xe-for-ci. This patch set provides fixup commits to bump
> the versions.
> 
> Julia INTEL (3):
>   fixup! topic/xe-for-CI: Define GuC firmware for NVL-S
>   fixup! topic/for-xe-CI: drm/xe/cri: Define GuC firmware for CRI
>   fixup! topic/xe-for-CI: Define GuC firmware for NVL-P
> 
>  drivers/gpu/drm/xe/xe_uc_fw.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> -- 
> 2.51.0
>