[Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [v9,1/5] drm: Add function to convert rect in 16.16 fixed format to regular format (rev2)
URL   : https://patchwork.freedesktop.org/series/85092/
State : failure

== Summary ==

Applying: drm: Add function to convert rect in 16.16 fixed format to regular format
Applying: drm/i915/display/psr: Use plane damage clips to calculate damaged area
Applying: drm/i915/display: Split and export main surface calculation from skl_check_main_surface()
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/display/intel_display.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915/display: Split and export main surface calculation from skl_check_main_surface()
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".