✗ Fi.CI.BUILD: failure for series starting with [01/24] HAX to make DSC work on the icelake test system

[Patchwork]

== Series Details ==

Series: series starting with [01/24] HAX to make DSC work on the icelake test system
URL   : https://patchwork.freedesktop.org/series/67726/
State : failure

== Summary ==

Applying: HAX to make DSC work on the icelake test system
Applying: drm/i915: Fix for_each_intel_plane_mask definition
Applying: drm/i915: Introduce and use intel_atomic_crtc_state_for_each_plane_state.
Applying: drm/i915: Remove cursor use of properties for coordinates
Applying: drm/i915: Use intel_plane_state in prepare and cleanup plane_fb
Applying: drm/i915: Remove begin/finish_crtc_commit, v4.
Applying: drm/i915: Introduce intel_atomic_get_plane_state_after_check()
Applying: drm/i915: Prepare to split crtc state in uapi and hw state
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_ddi.c
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/display/intel_display_types.h
M	drivers/gpu/drm/i915/display/intel_psr.c
M	drivers/gpu/drm/i915/i915_debugfs.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/display/intel_psr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
Patch failed at 0008 drm/i915: Prepare to split crtc state in uapi and hw state
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".