[Intel-gfx] ✗ Fi.CI.BUILD: failure for DP DSC min/max src bpc fixes (rev4)

[Patchwork]

== Series Details ==

Series: DP DSC min/max src bpc fixes (rev4)
URL   : https://patchwork.freedesktop.org/series/125571/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/125571/revisions/4/mbox/ not applied
Applying: drm/i915/dp: Simplify checks for helper intel_dp_dsc_max_src_input_bpc
Applying: drm/i915/dp: Fix the max DSC bpc supported by source
Applying: drm/i915/dp_mst: Use helpers to get dsc min/max input bpc
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dp.c
M	drivers/gpu/drm/i915/display/intel_dp.h
M	drivers/gpu/drm/i915/display/intel_dp_mst.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.h
Auto-merging drivers/gpu/drm/i915/display/intel_dp.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/dp_mst: Use helpers to get dsc min/max input bpc
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".
Build failed, no error log produced