[Intel-gfx] ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev34)

[Lisovskiy, Stanislav]

As patches 2,3,7 were pushed - can't now send particular patches, because it fails to apply
same patch twice.
So will _have to_ resend the whole series again.

Best Regards,

Lisovskiy Stanislav

Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

________________________________________
From: Patchwork <patchwork at emeril.freedesktop.org>
Sent: Tuesday, May 5, 2020 11:11:06 AM
To: Lisovskiy, Stanislav
Cc: intel-gfx at lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev34)

== Series Details ==

Series: SAGV support for Gen12+ (rev34)
URL   : https://patchwork.freedesktop.org/series/75129/
State : failure

== Summary ==

Applying: drm/i915: Introduce skl_plane_wm_level accessor.
Applying: drm/i915: Use bw state for per crtc SAGV evaluation
Using index info to reconstruct a base tree...
M       drivers/gpu/drm/i915/display/intel_bw.h
M       drivers/gpu/drm/i915/intel_pm.c
M       drivers/gpu/drm/i915/intel_pm.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/display/intel_bw.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 drm/i915: Use bw state for per crtc SAGV evaluation
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".