== Series Details == Series: drm/i915: Port sync for skl+ URL : https://patchwork.freedesktop.org/series/74691/ State : failure == Summary == Applying: drm/i915/mst: Use .compute_config_late() to compute master transcoder Applying: drm/i915: Move TRANS_DDI_FUNC_CTL2 programming where it belongs Applying: drm/i915: Drop usless master_transcoder assignments Applying: drm/i915: Move icl_get_trans_port_sync_config() into the DDI code Applying: drm/i915: Use REG_FIELD_PREP() & co. for TRANS_DDI_FUNC_CTL2 Applying: drm/i915: Include port sync state in the state dump Applying: drm/i915: Store cpu_transcoder_mask in device info Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_drv.h M drivers/gpu/drm/i915/i915_pci.c Falling back to patching base and 3-way merge... 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0007 drm/i915: Store cpu_transcoder_mask in device info 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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
