From: Sean Paul <sean@poorly.run> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, Sean Paul <seanpaul@chromium.org>, juston.li@intel.com, rodrigo.vivi@intel.com Subject: [PATCH v5 12/16] drm/i915: Plumb port through hdcp init Date: Thu, 5 Mar 2020 15:12:32 -0500 [thread overview] Message-ID: <20200305201236.152307-13-sean@poorly.run> (raw) In-Reply-To: <20200305201236.152307-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> 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> Signed-off-by: Sean Paul <seanpaul@chromium.org> Changes in v5: -Added to the set --- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 11 ++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index f41fe9e9d6f89..abcb53975e0d5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -601,7 +601,8 @@ int intel_dp_init_hdcp(struct intel_digital_port *intel_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 0ee29f88bab2d..fc3ce7586084c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -1959,6 +1959,7 @@ enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) } static inline 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); @@ -1966,8 +1967,7 @@ static inline 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 @@ -2034,14 +2034,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; @@ -2051,6 +2051,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); @@ -2061,7 +2062,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 7c12ad609b1fe..713dc20853745 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.h +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h @@ -21,7 +21,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 29149b59f9e40..8b32c3c986bca 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -3189,7 +3189,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_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_DEBUG_KMS("HDCP init failed, skipping.\n"); -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Sean Paul <sean@poorly.run> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, Sean Paul <seanpaul@chromium.org> Subject: [Intel-gfx] [PATCH v5 12/16] drm/i915: Plumb port through hdcp init Date: Thu, 5 Mar 2020 15:12:32 -0500 [thread overview] Message-ID: <20200305201236.152307-13-sean@poorly.run> (raw) In-Reply-To: <20200305201236.152307-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> 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> Signed-off-by: Sean Paul <seanpaul@chromium.org> Changes in v5: -Added to the set --- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 11 ++++++----- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index f41fe9e9d6f89..abcb53975e0d5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -601,7 +601,8 @@ int intel_dp_init_hdcp(struct intel_digital_port *intel_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 0ee29f88bab2d..fc3ce7586084c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -1959,6 +1959,7 @@ enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) } static inline 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); @@ -1966,8 +1967,7 @@ static inline 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 @@ -2034,14 +2034,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; @@ -2051,6 +2051,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); @@ -2061,7 +2062,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 7c12ad609b1fe..713dc20853745 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.h +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h @@ -21,7 +21,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 29149b59f9e40..8b32c3c986bca 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -3189,7 +3189,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_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_DEBUG_KMS("HDCP init failed, skipping.\n"); -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-03-05 20:13 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-05 20:12 [PATCH v5 00/16] drm/i915: Add support for HDCP 1.4 over MST connectors Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 01/16] drm/i915: Fix sha_text population code Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` Sean Paul 2020-03-07 23:20 ` Sasha Levin 2020-03-07 23:20 ` [Intel-gfx] " Sasha Levin 2020-03-05 20:12 ` [PATCH v5 02/16] drm/i915: Clear the repeater bit on HDCP disable Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` Sean Paul 2020-03-07 23:20 ` Sasha Levin 2020-03-07 23:20 ` [Intel-gfx] " Sasha Levin 2020-03-05 20:12 ` [PATCH v5 03/16] drm/i915: WARN if HDCP signalling is enabled upon disable Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 04/16] drm/i915: Intercept Aksv writes in the aux hooks Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 05/16] drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 06/16] drm/i915: Factor out hdcp->value assignments Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 07/16] drm/i915: Protect workers against disappearing connectors Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 08/16] drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 09/16] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 10/16] drm/i915: Use ddi_update_pipe in intel_dp_mst Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 11/16] drm/i915: Factor out HDCP shim functions from dp for use by dp_mst Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` Sean Paul [this message] 2020-03-05 20:12 ` [Intel-gfx] [PATCH v5 12/16] drm/i915: Plumb port through hdcp init Sean Paul 2020-03-05 20:12 ` [PATCH v5 13/16] drm/i915: Add connector to hdcp_shim->check_link() Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 14/16] drm/mst: Add support for QUERY_STREAM_ENCRYPTION_STATUS MST sideband message Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-26 16:46 ` Lyude Paul 2020-03-26 16:46 ` Lyude Paul 2020-04-07 12:13 ` Jani Nikula 2020-04-07 12:13 ` Jani Nikula 2020-03-05 20:12 ` [PATCH v5 15/16] drm/i915: Print HDCP version info for all connectors Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-05 20:12 ` [PATCH v5 16/16] drm/i915: Add HDCP 1.4 support for MST connectors Sean Paul 2020-03-05 20:12 ` [Intel-gfx] " Sean Paul 2020-03-06 3:22 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for HDCP 1.4 over MST connectors (rev5) Patchwork 2020-03-06 3:42 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork 2020-03-06 3:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-03-06 20:49 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200305201236.152307-13-sean@poorly.run \ --to=sean@poorly.run \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=juston.li@intel.com \ --cc=rodrigo.vivi@intel.com \ --cc=seanpaul@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.