Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/hdcp: Use correct aux for capability check scenario

Send the correct aux rather than the one derived
from intel_digital_port so that the HDCP version of both monitors
are fetched rather than just the primary one's

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230830073437.666263-3-suraj.kandpal@intel.com

authored by

Suraj Kandpal and committed by
Uma Shankar
a35239a8 130849f8

+4 -2
+4 -2
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
··· 651 651 int intel_dp_hdcp2_capable(struct intel_connector *connector, 652 652 bool *capable) 653 653 { 654 - struct intel_digital_port *dig_port = intel_attached_dig_port(connector); 654 + struct drm_dp_aux *aux; 655 655 u8 rx_caps[3]; 656 656 int ret; 657 657 658 + aux = intel_dp_hdcp_get_aux(connector); 659 + 658 660 *capable = false; 659 - ret = drm_dp_dpcd_read(&dig_port->dp.aux, 661 + ret = drm_dp_dpcd_read(aux, 660 662 DP_HDCP_2_2_REG_RX_CAPS_OFFSET, 661 663 rx_caps, HDCP_2_2_RXCAPS_LEN); 662 664 if (ret != HDCP_2_2_RXCAPS_LEN)