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 13/16] drm/i915: Add connector to hdcp_shim->check_link() Date: Thu, 5 Mar 2020 15:12:33 -0500 [thread overview] Message-ID: <20200305201236.152307-14-sean@poorly.run> (raw) In-Reply-To: <20200305201236.152307-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Currently we derive the connector from digital port in check_link(). For MST, this isn't sufficient since the digital port passed into the function can have multiple connectors downstream. This patch adds connector to the check_link() arguments so we have it when we need it. Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-13-sean@poorly.run # v4 Changes in v4: -Added to the set Changes in v5: -None --- drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 5 ++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 3cac51955f250..9cc43dcbb518f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -312,7 +312,8 @@ struct intel_hdcp_shim { bool enable); /* Ensures the link is still protected */ - bool (*check_link)(struct intel_digital_port *intel_dig_port); + bool (*check_link)(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector); /* Detects panel's hdcp capability. This is optional for HDMI. */ int (*hdcp_capable)(struct intel_digital_port *intel_dig_port, diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index abcb53975e0d5..549f02f622b45 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -538,7 +538,8 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, } static -bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port) +bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector) { ssize_t ret; u8 bstatus; diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index fc3ce7586084c..e0418ad202d1f 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -956,7 +956,7 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } - if (hdcp->shim->check_link(intel_dig_port)) { + if (hdcp->shim->check_link(intel_dig_port, connector)) { if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { intel_hdcp_update_value(connector, DRM_MODE_CONTENT_PROTECTION_ENABLED, true); diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 8b32c3c986bca..288525a9fdf7c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1522,11 +1522,10 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, } static -bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) +bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector) { struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); - struct intel_connector *connector = - intel_dig_port->hdmi.attached_connector; enum port port = intel_dig_port->base.port; enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder; int ret; -- 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 13/16] drm/i915: Add connector to hdcp_shim->check_link() Date: Thu, 5 Mar 2020 15:12:33 -0500 [thread overview] Message-ID: <20200305201236.152307-14-sean@poorly.run> (raw) In-Reply-To: <20200305201236.152307-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Currently we derive the connector from digital port in check_link(). For MST, this isn't sufficient since the digital port passed into the function can have multiple connectors downstream. This patch adds connector to the check_link() arguments so we have it when we need it. Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-13-sean@poorly.run # v4 Changes in v4: -Added to the set Changes in v5: -None --- drivers/gpu/drm/i915/display/intel_display_types.h | 3 ++- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 5 ++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 3cac51955f250..9cc43dcbb518f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -312,7 +312,8 @@ struct intel_hdcp_shim { bool enable); /* Ensures the link is still protected */ - bool (*check_link)(struct intel_digital_port *intel_dig_port); + bool (*check_link)(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector); /* Detects panel's hdcp capability. This is optional for HDMI. */ int (*hdcp_capable)(struct intel_digital_port *intel_dig_port, diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index abcb53975e0d5..549f02f622b45 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -538,7 +538,8 @@ int intel_dp_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, } static -bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port) +bool intel_dp_hdcp_check_link(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector) { ssize_t ret; u8 bstatus; diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index fc3ce7586084c..e0418ad202d1f 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -956,7 +956,7 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } - if (hdcp->shim->check_link(intel_dig_port)) { + if (hdcp->shim->check_link(intel_dig_port, connector)) { if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { intel_hdcp_update_value(connector, DRM_MODE_CONTENT_PROTECTION_ENABLED, true); diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 8b32c3c986bca..288525a9fdf7c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1522,11 +1522,10 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, } static -bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) +bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port, + struct intel_connector *connector) { struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev); - struct intel_connector *connector = - intel_dig_port->hdmi.attached_connector; enum port port = intel_dig_port->base.port; enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder; int ret; -- 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 ` [PATCH v5 12/16] drm/i915: Plumb port through hdcp init 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 13/16] drm/i915: Add connector to hdcp_shim->check_link() 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-14-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.