✗ Fi.CI.BUILD: failure for series starting with [1/2] drm/i915/display/tgl+: Implement new PLL programming step

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915/display/tgl+: Implement new PLL programming step
URL   : https://patchwork.freedesktop.org/series/100116/
State : failure

== Summary ==

Applying: drm/i915/display/tgl+: Implement new PLL programming step
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_bios.c
M	drivers/gpu/drm/i915/display/intel_display.c
M	drivers/gpu/drm/i915/display/intel_display_debugfs.c
M	drivers/gpu/drm/i915/display/intel_dpll_mgr.c
M	drivers/gpu/drm/i915/display/intel_dpll_mgr.h
M	drivers/gpu/drm/i915/display/intel_vbt_defs.h
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_reg.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_debugfs.c
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
Patch failed at 0001 drm/i915/display/tgl+: Implement new PLL programming step
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".