✗ Fi.CI.BUILD: failure for Enable dislay support for Battlemage

[Patchwork]

== Series Details ==

Series: Enable dislay support for Battlemage
URL   : https://patchwork.freedesktop.org/series/131984/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/131984/revisions/1/mbox/ not applied
Applying: drm/i915/display: Prepare to handle new C20 PLL register address
Applying: drm/xe/bmg: Add BMG platform definition
Applying: drm/xe/bmg: Define IS_BATTLEMAGE macro
Applying: drm/i915/bmg: Define IS_BATTLEMAGE macro
Applying: drm/i915/xe2: Skip CCS modifiers for Xe2 platforms
Applying: drm/i915/xe2hpd: Initial cdclk table
Applying: Revert "drm/i915/dgfx: DGFX uses direct VBT pin mapping"
Applying: drm/i915/bmg: Extend DG2 tc check to future
Applying: drm/i915/xe2hpd: Properly disable power in port A
Applying: drm/i915/xe2hpd: Add new C20 PLL register address
Applying: drm/i915/xe2hpd: Add support for eDP PLL configuration
Applying: drm/i915/xe2hpd: update pll values in sync with Bspec
Applying: drm/i915/xe2hpd: Add display info
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display_device.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_device.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0013 drm/i915/xe2hpd: Add display info
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