✗ Fi.CI.BUILD: failure for drm/i915/cx0_phy: Update HDMI TMDS C20 algorithm value

Patchwork patchwork at emeril.freedesktop.org
Wed Nov 13 11:35:04 UTC 2024


== Series Details ==

Series: drm/i915/cx0_phy: Update HDMI TMDS C20 algorithm value
URL   : https://patchwork.freedesktop.org/series/141280/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/141280/revisions/1/mbox/ not applied
Applying: drm/i915/cx0_phy: Update HDMI TMDS C20 algorithm value
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_cx0_phy.c
M	drivers/gpu/drm/i915/display/intel_cx0_phy.h
M	drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
M	include/drm/intel/pciids.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/intel/pciids.h
CONFLICT (content): Merge conflict in include/drm/intel/pciids.h
Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cx0_phy.h
Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/cx0_phy: Update HDMI TMDS C20 algorithm value
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 mailing list