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

drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable

Use intel_connector as argument instead of intel_digital_port in
hdcp_2_2_capable function and dig_port can be later derived from
connector. This will help with getting the correct hdcp version of
particular monitor in a MST setup.

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-2-suraj.kandpal@intel.com

authored by

Suraj Kandpal and committed by
Uma Shankar
130849f8 c1464a89

+6 -5
+1 -1
drivers/gpu/drm/i915/display/intel_display_types.h
··· 500 500 enum hdcp_wired_protocol protocol; 501 501 502 502 /* Detects whether sink is HDCP2.2 capable */ 503 - int (*hdcp_2_2_capable)(struct intel_digital_port *dig_port, 503 + int (*hdcp_2_2_capable)(struct intel_connector *connector, 504 504 bool *capable); 505 505 506 506 /* Write HDCP2.2 messages */
+2 -1
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
··· 648 648 } 649 649 650 650 static 651 - int intel_dp_hdcp2_capable(struct intel_digital_port *dig_port, 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 655 u8 rx_caps[3]; 655 656 int ret; 656 657
+1 -2
drivers/gpu/drm/i915/display/intel_hdcp.c
··· 163 163 /* Is HDCP2.2 capable on Platform and Sink */ 164 164 bool intel_hdcp2_capable(struct intel_connector *connector) 165 165 { 166 - struct intel_digital_port *dig_port = intel_attached_dig_port(connector); 167 166 struct drm_i915_private *i915 = to_i915(connector->base.dev); 168 167 struct intel_hdcp *hdcp = &connector->hdcp; 169 168 bool capable = false; ··· 192 193 mutex_unlock(&i915->display.hdcp.hdcp_mutex); 193 194 194 195 /* Sink's capability for HDCP2.2 */ 195 - hdcp->shim->hdcp_2_2_capable(dig_port, &capable); 196 + hdcp->shim->hdcp_2_2_capable(connector, &capable); 196 197 197 198 return capable; 198 199 }
+2 -1
drivers/gpu/drm/i915/display/intel_hdmi.c
··· 1735 1735 } 1736 1736 1737 1737 static 1738 - int intel_hdmi_hdcp2_capable(struct intel_digital_port *dig_port, 1738 + int intel_hdmi_hdcp2_capable(struct intel_connector *connector, 1739 1739 bool *capable) 1740 1740 { 1741 + struct intel_digital_port *dig_port = intel_attached_dig_port(connector); 1741 1742 u8 hdcp2_version; 1742 1743 int ret; 1743 1744