[igt-dev] ✗ Fi.CI.BUILD: failure for This patch series enables the compression feature for XE2 Lunarlake
Patchwork
patchwork at emeril.freedesktop.org
Wed Nov 8 09:07:54 UTC 2023
== Series Details ==
Series: This patch series enables the compression feature for XE2 Lunarlake
URL : https://patchwork.freedesktop.org/series/126124/
State : failure
== Summary ==
Applying: XE2: LNL: adding Blt command support for Lunarlake
Applying: XE2: xe_ccs IGT changes to enable xe2 igfx compression
Using index info to reconstruct a base tree...
M lib/intel_blt.c
M lib/intel_blt.h
A lib/intel_pat.c
A lib/intel_pat.h
M tests/intel/gem_ccs.c
M tests/intel/xe_ccs.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/xe_ccs.c
CONFLICT (content): Merge conflict in tests/intel/xe_ccs.c
Auto-merging tests/intel/gem_ccs.c
CONFLICT (modify/delete): lib/intel_pat.h deleted in HEAD and modified in XE2: xe_ccs IGT changes to enable xe2 igfx compression. Version XE2: xe_ccs IGT changes to enable xe2 igfx compression of lib/intel_pat.h left in tree.
CONFLICT (modify/delete): lib/intel_pat.c deleted in HEAD and modified in XE2: xe_ccs IGT changes to enable xe2 igfx compression. Version XE2: xe_ccs IGT changes to enable xe2 igfx compression of lib/intel_pat.c left in tree.
Auto-merging lib/intel_blt.h
Auto-merging lib/intel_blt.c
CONFLICT (content): Merge conflict in lib/intel_blt.c
Patch failed at 0002 XE2: xe_ccs IGT changes to enable xe2 igfx compression
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".
More information about the igt-dev
mailing list