✗ Fi.CI.BUILD: failure for Add DSC fractional bpp support (rev4)
Patchwork
patchwork at emeril.freedesktop.org
Fri Apr 28 21:41:39 UTC 2023
== Series Details ==
Series: Add DSC fractional bpp support (rev4)
URL : https://patchwork.freedesktop.org/series/111054/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/111054/revisions/4/mbox/ not applied
Applying: drm/i915/dp: Remove extra logs for printing DSC info
Applying: drm/i915/dp: Avoid forcing DSC BPC for MST case
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_mst.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in 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 0002 drm/i915/dp: Avoid forcing DSC BPC for MST case
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
More information about the Intel-gfx-trybot
mailing list