[Intel-gfx] ✗ Fi.CI.BUILD: failure for i915/display: split and constify vtable (rev6)

[Patchwork]

== Series Details ==

Series: i915/display: split and constify vtable (rev6)
URL   : https://patchwork.freedesktop.org/series/94459/
State : failure

== Summary ==

Applying: drm/i915/uncore: split the fw get function into separate vfunc
Applying: drm/i915/pm: drop get_fifo_size vfunc.
Applying: drm/i915: make update_wm take a dev_priv.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915: make update_wm take a dev_priv.
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".