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

drm/i915: Plumb port through hdcp init 



This patch plumbs port through hdcp init instead of relying on
intel_attached_encoder() to return a non-NULL encoder which won't work
for MST connectors.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
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/20200305201236.152307-13-sean@poorly.run #v5
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-13-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-14-sean@poorly.run

 #v7

Changes in v5:
-Added to the set
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-14-sean@poorly.run
parent d079b7e4

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

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ int intel_dp_init_hdcp(struct intel_digital_port *dig_port, 
		return 0;



	if (!intel_dp_is_edp(intel_dp))

		return intel_hdcp_init(intel_connector, &intel_dp_hdcp_shim);

		return intel_hdcp_init(intel_connector, port,

				       &intel_dp_hdcp_shim);



	return 0;

}

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

+6 −5
Original line number Diff line number Diff line
@@ -1945,6 +1945,7 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) 
}



static int initialize_hdcp_port_data(struct intel_connector *connector,

				     enum port port,

				     const struct intel_hdcp_shim *shim)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
@@ -1952,8 +1953,7 @@ static int initialize_hdcp_port_data(struct intel_connector *connector, 
	struct hdcp_port_data *data = &hdcp->port_data;



	if (INTEL_GEN(dev_priv) < 12)

		data->fw_ddi =

			intel_get_mei_fw_ddi_index(intel_attached_encoder(connector)->port);

		data->fw_ddi = intel_get_mei_fw_ddi_index(port);

	else

		/*

		 * As per ME FW API expectation, for GEN 12+, fw_ddi is filled
@@ -2023,14 +2023,14 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv) 
	}

}



static void intel_hdcp2_init(struct intel_connector *connector,

static void intel_hdcp2_init(struct intel_connector *connector, enum port port,

			     const struct intel_hdcp_shim *shim)

{

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

	struct intel_hdcp *hdcp = &connector->hdcp;

	int ret;



	ret = initialize_hdcp_port_data(connector, shim);

	ret = initialize_hdcp_port_data(connector, port, shim);

	if (ret) {

		drm_dbg_kms(&i915->drm, "Mei hdcp data init failed\n");

		return;
@@ -2040,6 +2040,7 @@ static void intel_hdcp2_init(struct intel_connector *connector, 
}



int intel_hdcp_init(struct intel_connector *connector,

		    enum port port,

		    const struct intel_hdcp_shim *shim)

{

	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
@@ -2050,7 +2051,7 @@ int intel_hdcp_init(struct intel_connector *connector, 
		return -EINVAL;



	if (is_hdcp2_supported(dev_priv))

		intel_hdcp2_init(connector, shim);

		intel_hdcp2_init(connector, port, shim);



	ret =

	drm_connector_attach_content_protection_property(&connector->base,

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ enum transcoder; 
void intel_hdcp_atomic_check(struct drm_connector *connector,

			     struct drm_connector_state *old_state,

			     struct drm_connector_state *new_state);

int intel_hdcp_init(struct intel_connector *connector,

int intel_hdcp_init(struct intel_connector *connector, enum port port,

		    const struct intel_hdcp_shim *hdcp_shim);

int intel_hdcp_enable(struct intel_connector *connector,

		      enum transcoder cpu_transcoder, u8 content_type);

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

+1 −1
Original line number Diff line number Diff line
@@ -3270,7 +3270,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port, 
	intel_hdmi->attached_connector = intel_connector;



	if (is_hdcp_supported(dev_priv, port)) {

		int ret = intel_hdcp_init(intel_connector,

		int ret = intel_hdcp_init(intel_connector, port,

					  &intel_hdmi_hdcp_shim);

		if (ret)

			drm_dbg_kms(&dev_priv->drm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE