== Series Details == Series: More ICL display patches (rev8) URL : https://patchwork.freedesktop.org/series/43546/ State : failure == Summary == Applying: drm/i915/icl: Extend AUX F interrupts to ICL Applying: drm/i915/icl: GSE interrupt moves from DE_MISC to GU_MISC Applying: drm/i915/icl: introduce tc_port Applying: drm/i915/icl: Support for TC North Display interrupts Applying: drm/i915/icp: Add Interrupt Support Applying: drm/i915/ICL: Add register definition for DFLEXDPMLE Applying: drm/i915/icl: Add DDI HDMI level selection for ICL Applying: drm/i915/icl: Map VBT DDC Pin to BSpec DDC Pin Applying: drm/i915/icl: Add Icelake PCH detection Applying: drm/i915/icl: add icelake_get_ddi_pll() Applying: drm/i915/icl: Get DDI clock for ICL based on PLLs. Applying: drm/i915/icl: Calculate link clock using the new registers Applying: drm/i915/icl: unconditionally init DDI for every port Applying: drm/i915/icl: start adding the TBT pll Applying: drm/i915/icl: compute the TBT PLL registers Applying: drm/i915/icl: Handle hotplug interrupts for DP over TBT Applying: drm/i915/icl: Add 10-bit support for hdmi Applying: drm/i915/icl: implement icl_digital_port_connected() Applying: drm/i915/icl: store the port type for TC ports Applying: drm/i915/icl: implement the tc/legacy HPD {dis, }connect flow for DP Applying: drm/i915/icl: implement the legacy HPD {dis, }connect flow for HDMI Applying: drm/i915/icl: Update FIA supported lane count for hpd. Applying: drm/i915/icl: program MG_DP_MODE Applying: drm/i915/icl: toggle PHY clock gating around link training Applying: drm/i915/icl: fix gmbus gpio pin mapping error: Failed to merge in the changes. Using index info to reconstruct a base tree... M drivers/gpu/drm/i915/i915_reg.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/i915_reg.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h Patch failed at 0025 drm/i915/icl: fix gmbus gpio pin mapping The copy of the patch that failed is found in: .git/rebase-apply/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". _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
