diff options
author | Suraj Kandpal <suraj.kandpal@intel.com> | 2023-08-30 09:34:38 +0200 |
---|---|---|
committer | Uma Shankar <uma.shankar@intel.com> | 2023-09-01 09:47:44 +0200 |
commit | a35239a8925986e83c41c92f7147e5bce00d86d5 (patch) | |
tree | a1fa7a5f13f35204bc92836f1364ee4ab905dde7 /drivers/gpu/drm/i915/display/intel_dp_hdcp.c | |
parent | drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable (diff) | |
download | linux-a35239a8925986e83c41c92f7147e5bce00d86d5.tar.xz linux-a35239a8925986e83c41c92f7147e5bce00d86d5.zip |
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
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_hdcp.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index 3b579887bb99..3a595cd433d4 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -651,12 +651,14 @@ static int intel_dp_hdcp2_capable(struct intel_connector *connector, bool *capable) { - struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct drm_dp_aux *aux; u8 rx_caps[3]; int ret; + aux = intel_dp_hdcp_get_aux(connector); + *capable = false; - ret = drm_dp_dpcd_read(&dig_port->dp.aux, + ret = drm_dp_dpcd_read(aux, DP_HDCP_2_2_REG_RX_CAPS_OFFSET, rx_caps, HDCP_2_2_RXCAPS_LEN); if (ret != HDCP_2_2_RXCAPS_LEN) |