✗ Fi.CI.BUILD: failure for drm/i915, drm/xe: add drm device based pcode interface for display (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915, drm/xe: add drm device based pcode interface for display (rev2)
URL   : https://patchwork.freedesktop.org/series/149878/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/149878/revisions/2/mbox/ not applied
Applying: drm/i915/pcode: drop fast wait from snb_pcode_write_timeout()
Applying: drm/i915/pcode: add struct drm_device based interface
Applying: drm/xe/pcode: add struct drm_device based interface
Applying: drm/i915/display: switch to struct drm_device based pcode interface
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/hsw_ips.c
M	drivers/gpu/drm/i915/display/intel_bw.c
M	drivers/gpu/drm/i915/display/intel_cdclk.c
M	drivers/gpu/drm/i915/display/intel_display_power.c
M	drivers/gpu/drm/i915/display/intel_display_power_well.c
M	drivers/gpu/drm/i915/display/intel_hdcp.c
M	drivers/gpu/drm/i915/display/skl_watermark.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/skl_watermark.c
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c
Auto-merging drivers/gpu/drm/i915/display/intel_bw.c
Auto-merging drivers/gpu/drm/i915/display/hsw_ips.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 drm/i915/display: switch to struct drm_device based pcode interface
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