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

[Lisovskiy, Stanislav]

Looks like I'l have to resend the series, because patches 2,3,4  were now pushed and git am fails to reapply those as part of this series,
when I first sent those as in-reply.

Best Regards,

Lisovskiy Stanislav

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

________________________________________
From: Patchwork <patchwork at emeril.freedesktop.org>
Sent: Monday, April 20, 2020 11:58:54 AM
To: Lisovskiy, Stanislav
Cc: intel-gfx at lists.freedesktop.org
Subject: ✗ Fi.CI.BUILD: failure for SAGV support for Gen12+ (rev25)

== Series Details ==

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

== Summary ==

Applying: drm/i915: Introduce skl_plane_wm_level accessor.
Applying: drm/i915: Add intel_atomic_get_bw_*_state helpers
Using index info to reconstruct a base tree...
M       drivers/gpu/drm/i915/display/intel_bw.c
M       drivers/gpu/drm/i915/display/intel_bw.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Prepare to extract gen specific functions from intel_can_enable_sagv
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.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: Prepare to extract gen specific functions from intel_can_enable_sagv
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".