In DP MST scenarios we derive the connector and in turn the aux from intel_digital_port which always gave the primary monitors aux, this caused the capability of the primary monitor to be checked twice rather than enumerating the different HDCP capabilities for each monitor because of this we saw the below issues -primary monitor = HDCP 1.4 secondary monitor : HDCP 2.2 1.4 i915_display_info reads as : HDCP 1.4 for both monitor -primary monitor = HDCP 2.2 1.4 secondary monitor : HDCP 1.4 i915_display_info reads as : HDCP 2.2 1.4 for both monitor Solution is to derive the aux from intel_connector instead. Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> Suraj Kandpal (2): drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable drm/i915/hdcp: Use correct aux for capability check scenario drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 7 +++++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) -- 2.25.1