[Intel-gfx] ✗ Fi.CI.BAT: failure for Enable Y210, Y212, Y216 formats for ICL (rev3)

[Patchwork]

== Series Details ==

Series: Enable Y210, Y212, Y216 formats for ICL (rev3)
URL   : https://patchwork.freedesktop.org/series/48729/
State : failure

== Summary ==

Applying: drm: Add Y210, Y212, Y216 format definitions and fourcc
Applying: drm/i915/icl: Add Y210, Y212, Y216 plane control definitions
Applying: drm/i915/icl: Preparations for enabling Y210, Y212, Y216 formats
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_sprite.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_sprite.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
error: Failed to merge in the changes.
Patch failed at 0003 drm/i915/icl: Preparations for enabling Y210, Y212, Y216 formats
Use 'git am --show-current-patch' to see the failed patch
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".