[Intel-gfx] ✗ Ro.CI.BAT: failure for Pre-calculate SKL-style atomicwatermarks (rev2)

[Patchwork]

== Series Details ==

Series: Pre-calculate SKL-style atomicwatermarks (rev2)
URL   : https://patchwork.freedesktop.org/series/6944/
State : failure

== Summary ==

Applying: drm/i915: Reorganize WM structs/unions in CRTC state
Applying: drm/i915: Rename s/skl_compute_pipe_wm/skl_build_pipe_wm/
Applying: drm/i915/gen9: Cache plane data rates in CRTC state
Applying: drm/i915/gen9: Allow calculation of data rate for in-flight state (v2)
Applying: drm/i915/gen9: Store plane minimum blocks in CRTC wm state (v2)
Applying: drm/i915: Track whether an atomic transaction changes the active CRTC's
Applying: drm/i915/gen9: Allow skl_allocate_pipe_ddb() to operate on in-flight state (v3)
Applying: drm/i915: Add distrust_bios_wm flag to dev_priv (v2)
Applying: drm/i915/gen9: Compute DDB allocation at atomic check time (v4)
Applying: drm/i915/gen9: Drop re-allocation of DDB at atomic commit (v2)
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_display.c
M	drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Patch failed at 0010 drm/i915/gen9: Drop re-allocation of DDB at atomic commit (v2)
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".