[Intel-gfx] ✗ Fi.CI.BUILD: failure for Add missing format_mod_supported functions (rev2)

[Patchwork]

== Series Details ==

Series: Add missing format_mod_supported functions (rev2)
URL   : https://patchwork.freedesktop.org/series/98680/
State : failure

== Summary ==

Applying: drm/plane: Make format_mod_supported truly optional
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/drm_plane.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/drm_plane.c
No changes -- Patch already applied.
Applying: drm/plane: Fix typo in format_mod_supported documentation
Using index info to reconstruct a base tree...
M	include/drm/drm_plane.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/simple-kms: Drop format_mod_supported function
Applying: drm/i915/display: Drop format_mod_supported function
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_cursor.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_cursor.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cursor.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 drm/i915/display: Drop format_mod_supported function
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".