Commit 038bac89 authored by Sean Paul's avatar Sean Paul Committed by Ramalingam C
Browse files

drm/i915: Add connector to hdcp_shim->check_link() 



Currently we derive the connector from digital port in check_link(). For
MST, this isn't sufficient since the digital port passed into the
function can have multiple connectors downstream. This patch adds
connector to the check_link() arguments so we have it when we need it.

Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: default avatarRamalingam C <ramalingam.c@intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-13-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-14-sean@poorly.run #v5
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-14-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-15-sean@poorly.run

 #v7

Changes in v4:
-Added to the set
Changes in v5:
-None
Changes in v6:
-None
Changes in v7:
-None
Changes in v8:
-None

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200818153910.27894-15-sean@poorly.run
parent bf3657da

drivers/gpu/drm/i915/display/intel_display_types.h

+2 −1
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ struct intel_hdcp_shim { 
				 bool enable);



	/* Ensures the link is still protected */

	bool (*check_link)(struct intel_digital_port *dig_port);

	bool (*check_link)(struct intel_digital_port *dig_port,

			   struct intel_connector *connector);



	/* Detects panel's hdcp capability. This is optional for HDMI. */

	int (*hdcp_capable)(struct intel_digital_port *dig_port,

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *dig_port, 
}



static

bool intel_dp_hdcp_check_link(struct intel_digital_port *dig_port)

bool intel_dp_hdcp_check_link(struct intel_digital_port *dig_port,

			      struct intel_connector *connector)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	ssize_t ret;

drivers/gpu/drm/i915/display/intel_hdcp.c

+1 −1
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static int intel_hdcp_check_link(struct intel_connector *connector) 
		goto out;

	}



	if (hdcp->shim->check_link(dig_port)) {

	if (hdcp->shim->check_link(dig_port, connector)) {

		if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {

			intel_hdcp_update_value(connector,

				DRM_MODE_CONTENT_PROTECTION_ENABLED, true);

drivers/gpu/drm/i915/display/intel_hdmi.c

+5 −5
Original line number Diff line number Diff line
@@ -1546,11 +1546,10 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *dig_port, 
}



static

bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port)

bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port,

				     struct intel_connector *connector)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	struct intel_connector *connector =

		dig_port->hdmi.attached_connector;

	enum port port = dig_port->base.port;

	enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;

	int ret;
@@ -1578,13 +1577,14 @@ bool intel_hdmi_hdcp_check_link_once(struct intel_digital_port *dig_port) 
}



static

bool intel_hdmi_hdcp_check_link(struct intel_digital_port *dig_port)

bool intel_hdmi_hdcp_check_link(struct intel_digital_port *dig_port,

				struct intel_connector *connector)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	int retry;



	for (retry = 0; retry < 3; retry++)

		if (intel_hdmi_hdcp_check_link_once(dig_port))

		if (intel_hdmi_hdcp_check_link_once(dig_port, connector))

			return true;



	drm_err(&i915->drm, "Link check failed\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE