✗ Fi.CI.BAT: failure for Tiger Lake batch 3 (rev4)

Patchwork
2019-08-20T22:30:33Z

== Series Details ==

Series: Tiger Lake batch 3 (rev4)
URL : https://patchwork.freedesktop.org/series/65290/
State : failure

== Summary ==

Applying: drm/i915/tgl: disable DDIC
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...
No changes -- Patch already applied.
Applying: drm/i915/tgl: add support for reading the timestamp frequency
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_device_info.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.c
No changes -- Patch already applied.
Applying: drm/i915/tgl: Move transcoders to pipes' powerwells
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display_power.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c
No changes -- Patch already applied.
Applying: drm/i915/tgl: update DMC firmware to 2.04
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/intel_csr.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/psr: Make PSR registers relative to transcoders
Applying: drm/i915: Add transcoder restriction to PSR2
Applying: drm/i915: Do not unmask PSR interruption in IRQ postinstall
Applying: drm/i915/psr: Only handle interruptions of the transcoder in use
Applying: drm/i915/bdw+: Enable PSR in any eDP port
Applying: drm/i915: Guard and warn if more than one eDP panel is present
Applying: drm/i915: Do not read PSR2 register in transcoders without PSR2
Applying: drm/i915/tgl: PSR link standby is not supported anymore
Applying: drm/i915/tgl: Access the right register when handling PSR interruptions
Applying: drm/i915/tgl: Add maximum resolution supported by PSR2 HW
Applying: drm/i915: Fix DP-MST crtc_mask
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_dp_mst.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915: Add for_each_new_intel_connector_in_state()
Applying: drm: Add for_each_oldnew_intel_crtc_in_state_reverse()
Applying: drm/i915: Disable pipes in reverse order
Applying: drm/i915/tgl: Select master transcoder in DP MST
Applying: drm/i915/tgl: Introduce initial Tiger Lake workarounds
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/gt/intel_workarounds.c
M drivers/gpu/drm/i915/intel_pm.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
No changes -- Patch already applied.
Applying: drm/i915/tgl: Enable VD HCP/MFX sub-pipe power gating
Applying: drm/i915/tgl: Do not apply WaIncreaseDefaultTLBEntries from GEN12 onwards
Applying: drm/i915/tgl: Register state context definition for Gen12
Applying: drm/i915/tgl: move DP_TP_* to transcoder
Applying: drm/i915/tgl: Implement TGL DisplayPort training sequence
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_ddi.c
M drivers/gpu/drm/i915/display/intel_dp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
Applying: HACK: drm/i915/tgl: Gen12 render context size
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_engine_cs.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/i915/tgl: add Gen12 default indirect ctx offset
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_lrc.c
M drivers/gpu/drm/i915/gt/intel_lrc_reg.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
No changes -- Patch already applied.
Applying: drm/i915/tgl: add GEN12_MAX_CONTEXT_HW_ID
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gem/i915_gem_context.c
M drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
No changes -- Patch already applied.
Applying: drm/i915/tgl: Gen12 csb support
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_lrc.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0029 drm/i915/tgl: Gen12 csb support
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".