✗ Fi.CI.BUILD: failure for series starting with [1/6] drm/i915/xehp: Use separate sseu init function

Patchwork patchwork at emeril.freedesktop.org
Wed May 11 02:56:26 UTC 2022


== Series Details ==

Series: series starting with [1/6] drm/i915/xehp: Use separate sseu init function
URL   : https://patchwork.freedesktop.org/series/103842/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/103842/revisions/1/mbox/ not applied
Applying: drm/i915/xehp: Use separate sseu init function
Applying: drm/i915/xehp: Drop GETPARAM lookups of I915_PARAM_[SUB]SLICE_MASK
Applying: drm/i915/sseu: Simplify gen11+ SSEU handling
Applying: drm/i915/sseu: Don't try to store EU mask internally in UAPI format
Applying: drm/i915/sseu: Disassociate internal subslice mask representation from uapi
Applying: drm/i915/pvc: Add SSEU changes
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/gt/intel_gt_regs.h
M	drivers/gpu/drm/i915/i915_drv.h
M	drivers/gpu/drm/i915/i915_pci.c
M	drivers/gpu/drm/i915/intel_device_info.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_device_info.h
Auto-merging drivers/gpu/drm/i915/i915_pci.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0006 drm/i915/pvc: Add SSEU changes
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