[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Implement HDCP2.2 (rev7)

Patchwork patchwork at emeril.freedesktop.org
Wed Jun 27 17:45:50 UTC 2018


== Series Details ==

Series: drm/i915: Implement HDCP2.2 (rev7)
URL   : https://patchwork.freedesktop.org/series/38254/
State : failure

== Summary ==

Applying: drm: hdcp2.2 authentication msg definitions
Applying: drm: HDMI and DP specific HDCP2.2 defines
Applying: mei: bus: whitelist hdcp client
Applying: linux/mei: Header for mei_hdcp driver interface
Applying: drm/i915: wrapping all hdcp var into intel_hdcp
Applying: drm/i915: Define HDCP2.2 related variables
Applying: drm/i915: Define Intel HDCP2.2 registers
Applying: drm/i915: Initialize HDCP2.2 and its MEI interface
Applying: drm/i915: Schedule hdcp_check_link in _intel_hdcp_enable
Applying: drm/i915: Pullout the bksv read and validation
Applying: drm/i915: Enable superior HDCP ver that is capable
Applying: drm/i915: Enable HDCP1.4 incase of HDCP2.2 failure
Applying: drm/i915: Implement HDCP2.2 Enable and Disable
Applying: drm/i915: Enable and Disable HDCP2.2 port encryption
Applying: drm/i915: Implement HDCP2.2 receiver authentication
Applying: drm/i915: Implement HDCP2.2 repeater authentication
Applying: drm/i915: Implement HDCP2.2 link integrity check
Applying: drm/i915: Handle HDCP2.2 downstream topology change
Applying: drm/i915: hdcp_check_link only on CP_IRQ
Applying: drm/i915: Check HDCP 1.4 and 2.2 link on CP_IRQ
Applying: drm/i915/gmbus: Increase the Bytes per Rd/Wr Op
Applying: drm/i915/gmbus: Enable burst read
Applying: drm/i915: Implement the HDCP2.2 support for DP
Applying: drm/i915: Implement the HDCP2.2 support for HDMI
Applying: drm/i915: Add HDCP2.2 support for DP connectors
Applying: drm/i915: Add HDCP2.2 support for HDMI connectors
Applying: misc/mei/hdcp: Client driver for HDCP application
Applying: misc/mei/hdcp: mei_hdcp_component_registered can be static
Using index info to reconstruct a base tree...
M	drivers/misc/mei/hdcp/mei_hdcp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/misc/mei/hdcp/mei_hdcp.c
CONFLICT (content): Merge conflict in drivers/misc/mei/hdcp/mei_hdcp.c
error: Failed to merge in the changes.
Patch failed at 0028 misc/mei/hdcp: mei_hdcp_component_registered can be static
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 mailing list