✗ Fi.CI.BAT: failure for series starting with [01/55] drm/i915: Write GPU relocs harder with gen3

Patchwork patchwork at emeril.freedesktop.org
Tue Nov 20 17:22:02 UTC 2018


== Series Details ==

Series: series starting with [01/55] drm/i915: Write GPU relocs harder with gen3
URL   : https://patchwork.freedesktop.org/series/52743/
State : failure

== Summary ==

Applying: drm/i915: Write GPU relocs harder with gen3
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_gem_execbuffer.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: drm/amdgpu: Reorder uvd ring init before uvd resume
Applying: drm/i915/selftests: Check we can recover a wedged device
Applying: drm/i915/selftests: Verify we can perform resets from atomic context
Applying: drm/i915/icl: Record the valid VDBoxes with SFC capability
Applying: drm/i915/icl: Mind the SFC units when resetting VD or VEBox engines
Applying: drm/i915: Return immediately if trylock fails for direct-reclaim
Applying: drm/i915/userptr: Avoid struct_mutex recursion for mmu_invalidate_range_start
Applying: drm/i915: Always try to reset the GPU on takeover
Applying: drm/i915: Cache the error string
Applying: drm/i915: Report the number of closed vma held by each context in debugfs
Applying: drm/i915: Remove debugfs/i915_ppgtt_info
Applying: drm/i915: Track all held rpm wakerefs
Applying: drm/i915: Markup paired operations on wakerefs
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
Patch failed at 0014 drm/i915: Markup paired operations on wakerefs
Use 'git am --show-current-patch' to see the failed 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".



More information about the Intel-gfx-trybot mailing list