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: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Ramalingam C <ramalingam.c@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-13-sean@poorly.run
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-13-sean@poorly.run
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-14-sean@poorly.run
Changes in v5:
-Added to the set
Changes in v6:
-None
Changes in v7:
-None
Changes in v8:
-None

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200818153910.27894-14-sean@poorly.run

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 0b8200bed061048040bf2971b50a312925008131..c164ad11e617eadf339fcd400de8795408dea7be 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 7bc8c06f3132b08ec2f38ff7744dc20b64375dab..d0c922f84d53ec27d16c974464524f183883afd7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -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,

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
index 86bbaec120cc30569510387017a95a63720e323a..1bbf5b67ed0af65fbb87643f2acf503f4d61db50 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
@@ -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);

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 9c3b1ae2cd2bc092734048bee9b670ab5c5f5d2b..c0ea16dae3b3ae293e2731ee2097b0485ea52955 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -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,