Commit 29b283a4 authored by Anshuman Gupta's avatar Anshuman Gupta
Browse files

drm/i915/hdcp: Pass dig_port to intel_hdcp_init 



Pass dig_port as an argument to intel_hdcp_init()
and intel_hdcp2_init().
This will be required for HDCP 2.2 stream encryption.

Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarRamalingam C <ramalingam.c@intel.com>
Tested-by: default avatarKarthik B S <karthik.b.s@intel.com>
Signed-off-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210111081120.28417-11-anshuman.gupta@intel.com
parent 3d2e4e8c

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

+2 −2
Original line number Diff line number Diff line
@@ -755,10 +755,10 @@ int intel_dp_init_hdcp(struct intel_digital_port *dig_port, 
		return 0;



	if (intel_connector->mst_port)

		return intel_hdcp_init(intel_connector, port,

		return intel_hdcp_init(intel_connector, dig_port,

				       &intel_dp_mst_hdcp_shim);

	else if (!intel_dp_is_edp(intel_dp))

		return intel_hdcp_init(intel_connector, port,

		return intel_hdcp_init(intel_connector, dig_port,

				       &intel_dp_hdcp_shim);



	return 0;

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

+7 −5
Original line number Diff line number Diff line
@@ -1979,12 +1979,13 @@ 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,

				     struct intel_digital_port *dig_port,

				     const struct intel_hdcp_shim *shim)

{

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

	struct intel_hdcp *hdcp = &connector->hdcp;

	struct hdcp_port_data *data = &hdcp->port_data;

	enum port port = dig_port->base.port;



	if (INTEL_GEN(dev_priv) < 12)

		data->fw_ddi = intel_get_mei_fw_ddi_index(port);
@@ -2057,14 +2058,15 @@ void intel_hdcp_component_init(struct drm_i915_private *dev_priv) 
	}

}



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

static void intel_hdcp2_init(struct intel_connector *connector,

			     struct intel_digital_port *dig_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, port, shim);

	ret = initialize_hdcp_port_data(connector, dig_port, shim);

	if (ret) {

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

		return;
@@ -2074,7 +2076,7 @@ static void intel_hdcp2_init(struct intel_connector *connector, enum port port, 
}



int intel_hdcp_init(struct intel_connector *connector,

		    enum port port,

		    struct intel_digital_port *dig_port,

		    const struct intel_hdcp_shim *shim)

{

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



	if (is_hdcp2_supported(dev_priv) && !connector->mst_port)

		intel_hdcp2_init(connector, port, shim);

		intel_hdcp2_init(connector, dig_port, shim);



	ret =

	drm_connector_attach_content_protection_property(&connector->base,

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

+3 −1
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ struct intel_connector; 
struct intel_crtc_state;

struct intel_encoder;

struct intel_hdcp_shim;

struct intel_digital_port;

enum port;

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, enum port port,

int intel_hdcp_init(struct intel_connector *connector,

		    struct intel_digital_port *dig_port,

		    const struct intel_hdcp_shim *hdcp_shim);

int intel_hdcp_enable(struct intel_connector *connector,

		      const struct intel_crtc_state *pipe_config, u8 content_type);

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

+1 −1
Original line number Diff line number Diff line
@@ -3292,7 +3292,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, port,

		int ret = intel_hdcp_init(intel_connector, dig_port,

					  &intel_hdmi_hdcp_shim);

		if (ret)

			drm_dbg_kms(&dev_priv->drm,