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

drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling 



Instead of using intel_dig_port's encoder pipe to determine which
transcoder to toggle signalling on, use the cpu_transcoder field already
stored in intel_hdmi.

This is particularly important for MST.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.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/20191212190230.188505-6-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-6-sean@poorly.run #v3
Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-6-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-6-sean@poorly.run #v5
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-6-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-6-sean@poorly.run

 #v7

Changes in v2:
-Added to the set
Changes in v3:
-s/hdcp/hdmi/ in commit msg (Ram)
Changes in v4:
-Rebased on intel_de_(read|write) change
Changes in v5:
-Update hdcp->cpu_transcoder in intel_hdcp_enable so it works with pipe != 0
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-6-sean@poorly.run
parent 58418f0c

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

+3 −10
Original line number Diff line number Diff line
@@ -1850,12 +1850,12 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state 
}



int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,

				     enum transcoder cpu_transcoder,

				     bool enable)

{

	struct drm_device *dev = intel_encoder->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	intel_wakeref_t wakeref;

	enum pipe pipe = 0;

	int ret = 0;

	u32 tmp;
@@ -1864,19 +1864,12 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, 
	if (drm_WARN_ON(dev, !wakeref))

		return -ENXIO;



	if (drm_WARN_ON(dev,

			!intel_encoder->get_hw_state(intel_encoder, &pipe))) {

		ret = -EIO;

		goto out;

	}



	tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(pipe));

	tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder));

	if (enable)

		tmp |= TRANS_DDI_HDCP_SIGNALLING;

	else

		tmp &= ~TRANS_DDI_HDCP_SIGNALLING;

	intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(pipe), tmp);

out:

	intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder), tmp);

	intel_display_power_put(dev_priv, intel_encoder->power_domain, wakeref);

	return ret;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct intel_crtc_state; 
struct intel_dp;

struct intel_dpll_hw_state;

struct intel_encoder;

enum transcoder;



void intel_ddi_fdi_post_disable(struct intel_atomic_state *state,

				struct intel_encoder *intel_encoder,
@@ -43,6 +44,7 @@ void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv, 
u32 bxt_signal_levels(struct intel_dp *intel_dp);

u32 ddi_signal_levels(struct intel_dp *intel_dp);

int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,

				     enum transcoder cpu_transcoder,

				     bool enable);

void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder);

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

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ struct intel_hdcp_shim { 


	/* Enables HDCP signalling on the port */

	int (*toggle_signalling)(struct intel_digital_port *dig_port,

				 enum transcoder cpu_transcoder,

				 bool enable);



	/* Ensures the link is still protected */

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

+1 −0
Original line number Diff line number Diff line
@@ -6616,6 +6616,7 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *dig_port, 


static

int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *dig_port,

				    enum transcoder cpu_transcoder,

				    bool enable)

{

	/* Not used for single stream DisplayPort setups */

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

+8 −7
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int intel_hdcp_auth(struct intel_connector *connector) 
		intel_de_write(dev_priv, HDCP_REP_CTL,

			       intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, port));



	ret = shim->toggle_signalling(dig_port, true);

	ret = shim->toggle_signalling(dig_port, cpu_transcoder, true);

	if (ret)

		return ret;
@@ -807,7 +807,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) 
	intel_de_write(dev_priv, HDCP_REP_CTL,

		       intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl);



	ret = hdcp->shim->toggle_signalling(dig_port, false);

	ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder, false);

	if (ret) {

		drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n");

		return ret;
@@ -1591,7 +1591,8 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) 
		    intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &

		    LINK_ENCRYPTION_STATUS);

	if (hdcp->shim->toggle_signalling) {

		ret = hdcp->shim->toggle_signalling(dig_port, true);

		ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder,

						    true);

		if (ret) {

			drm_err(&dev_priv->drm,

				"Failed to enable HDCP signalling. %d\n",
@@ -1641,7 +1642,8 @@ static int hdcp2_disable_encryption(struct intel_connector *connector) 
		drm_dbg_kms(&dev_priv->drm, "Disable Encryption Timedout");



	if (hdcp->shim->toggle_signalling) {

		ret = hdcp->shim->toggle_signalling(dig_port, false);

		ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder,

						    false);

		if (ret) {

			drm_err(&dev_priv->drm,

				"Failed to disable HDCP signalling. %d\n",
@@ -2027,11 +2029,10 @@ int intel_hdcp_enable(struct intel_connector *connector, 
	drm_WARN_ON(&dev_priv->drm,

		    hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);

	hdcp->content_type = content_type;



	if (INTEL_GEN(dev_priv) >= 12) {

	hdcp->cpu_transcoder = cpu_transcoder;



	if (INTEL_GEN(dev_priv) >= 12)

		hdcp->port_data.fw_tc = intel_get_mei_fw_tc(cpu_transcoder);

	}



	/*

	 * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup

CRA Git | Maintained and supported by SUSTech CRA and CCSE