From: Mark Yacoub <markyacoub@chromium.org>
To: quic_khsieh@quicinc.com, linux-arm-msm@vger.kernel.org,
dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
intel-gfx@lists.freedesktop.org
Cc: robdclark@gmail.com, quic_abhinavk@quicinc.com,
dmitry.baryshkov@linaro.org, sean@poorly.run, airlied@gmail.com,
daniel@ffwll.ch, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, agross@kernel.org,
andersson@kernel.org, konrad.dybcio@somainline.org,
jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com,
rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com,
markyacoub@chromium.org, tzimmermann@suse.de,
ville.syrjala@linux.intel.com, stanislav.lisovskiy@intel.com,
matthew.d.roper@intel.com, imre.deak@intel.com,
lucas.demarchi@intel.com, manasi.d.navare@intel.com,
swati2.sharma@intel.com, bhanuprakash.modem@intel.com,
javierm@redhat.com, jose.souza@intel.com, lyude@redhat.com,
hbh25y@gmail.com, arun.r.murthy@intel.com,
ashutosh.dixit@intel.com, ankit.k.nautiyal@intel.com,
maxime@cerno.tech, swboyd@chromium.org,
christophe.jaillet@wanadoo.fr, quic_sbillaka@quicinc.com,
johan+linaro@kernel.org, dianders@chromium.org, marex@denx.de,
quic_jesszhan@quicinc.com, bjorn.andersson@linaro.org,
abhinavk@codeaurora.org, seanpaul@chromium.org,
Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH v6 05/10] drm/i915/hdcp: Consolidate HDCP setup/state cache
Date: Wed, 18 Jan 2023 19:30:10 +0000 [thread overview]
Message-ID: <20230118193015.911074-6-markyacoub@google.com> (raw)
In-Reply-To: <20230118193015.911074-1-markyacoub@google.com>
From: Sean Paul <seanpaul@chromium.org>
Stick all of the setup for HDCP into a dedicated function. No functional
change, but this will facilitate moving HDCP logic into helpers.
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913175747.47456-6-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20210915203834.1439-6-sean@poorly.run #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20211001151145.55916-6-sean@poorly.run #v3
Link: https://patchwork.freedesktop.org/patch/msgid/20211105030434.2828845-6-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20220411204741.1074308-6-sean@poorly.run #v5
Changes in v2:
-None
Changes in v3:
-None
Changes in v4:
-None
Changes in v5:
-None
Changes in v6:
-None
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 52 +++++++++++++++--------
1 file changed, 35 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 396d2cef000a..0a20bc41be55 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2190,6 +2190,37 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder)
}
}
+static int
+_intel_hdcp_setup(struct intel_connector *connector,
+ const struct intel_crtc_state *pipe_config, u8 content_type)
+{
+ struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
+ struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
+ struct intel_hdcp *hdcp = &connector->hdcp;
+ int ret = 0;
+
+ if (!connector->encoder) {
+ drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n",
+ connector->base.name, connector->base.base.id);
+ return -ENODEV;
+ }
+
+ hdcp->content_type = content_type;
+
+ if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
+ hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;
+ hdcp->stream_transcoder = pipe_config->cpu_transcoder;
+ } else {
+ hdcp->cpu_transcoder = pipe_config->cpu_transcoder;
+ hdcp->stream_transcoder = INVALID_TRANSCODER;
+ }
+
+ if (DISPLAY_VER(dev_priv) >= 12)
+ dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder);
+
+ return ret;
+}
+
static int initialize_hdcp_port_data(struct intel_connector *connector,
struct intel_digital_port *dig_port,
const struct intel_hdcp_shim *shim)
@@ -2329,28 +2360,14 @@ int intel_hdcp_enable(struct intel_connector *connector,
if (!hdcp->shim)
return -ENOENT;
- if (!connector->encoder) {
- drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n",
- connector->base.name, connector->base.base.id);
- return -ENODEV;
- }
-
mutex_lock(&hdcp->mutex);
mutex_lock(&dig_port->hdcp_mutex);
drm_WARN_ON(&dev_priv->drm,
hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);
- hdcp->content_type = content_type;
-
- if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
- hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;
- hdcp->stream_transcoder = pipe_config->cpu_transcoder;
- } else {
- hdcp->cpu_transcoder = pipe_config->cpu_transcoder;
- hdcp->stream_transcoder = INVALID_TRANSCODER;
- }
- if (DISPLAY_VER(dev_priv) >= 12)
- dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder);
+ ret = _intel_hdcp_setup(connector, pipe_config, content_type);
+ if (ret)
+ goto out;
/*
* Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
@@ -2378,6 +2395,7 @@ int intel_hdcp_enable(struct intel_connector *connector,
true);
}
+out:
mutex_unlock(&dig_port->hdcp_mutex);
mutex_unlock(&hdcp->mutex);
return ret;
--
2.39.0.246.g2a6d74b583-goog
next prev parent reply other threads:[~2023-01-18 19:31 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 19:30 [PATCH v6 00/10] drm/hdcp: Pull HDCP auth/exchange/check into helpers Mark Yacoub
2023-01-18 19:30 ` [PATCH v6 01/10] drm/hdcp: Add drm_hdcp_atomic_check() Mark Yacoub
2023-01-19 10:37 ` Krzysztof Kozlowski
2023-01-20 15:32 ` Sean Paul
2023-01-20 20:33 ` Dmitry Baryshkov
2023-01-19 11:41 ` Dmitry Baryshkov
2023-03-10 5:30 ` [Intel-gfx] " Kandpal, Suraj
2023-01-18 19:30 ` [PATCH v6 02/10] drm/hdcp: Avoid changing crtc state in hdcp atomic check Mark Yacoub
2023-01-19 11:45 ` Dmitry Baryshkov
2023-03-10 6:00 ` [Intel-gfx] " Kandpal, Suraj
2023-01-18 19:30 ` [PATCH v6 03/10] drm/hdcp: Update property value on content type and user changes Mark Yacoub
2023-01-18 19:30 ` [PATCH v6 04/10] drm/hdcp: Expand HDCP helper library for enable/disable/check Mark Yacoub
2023-01-19 12:54 ` Dmitry Baryshkov
2023-01-18 19:30 ` Mark Yacoub [this message]
2023-01-18 19:30 ` [PATCH v6 06/10] drm/i915/hdcp: Retain hdcp_capable return codes Mark Yacoub
2023-03-10 8:25 ` Kandpal, Suraj
2023-03-23 7:17 ` Kandpal, Suraj
2023-03-24 19:27 ` Mark Yacoub
2023-03-28 5:52 ` Kandpal, Suraj
2023-01-18 19:30 ` [PATCH v6 07/10] drm/i915/hdcp: Use HDCP helpers for i915 Mark Yacoub
2023-01-31 17:16 ` [Intel-gfx] " Rodrigo Vivi
2023-01-31 17:23 ` Rodrigo Vivi
2023-03-14 5:54 ` Kandpal, Suraj
2023-03-24 19:34 ` Mark Yacoub
2023-03-28 6:12 ` Kandpal, Suraj
2023-01-18 19:30 ` [PATCH v6 08/10] dt-bindings: msm/dp: Add bindings for HDCP registers Mark Yacoub
2023-01-19 1:16 ` Rob Herring
2023-01-19 7:48 ` Johan Hovold
2023-01-19 8:36 ` Dmitry Baryshkov
2023-01-18 19:30 ` [PATCH v6 09/10] arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller Mark Yacoub
2023-01-19 1:32 ` Abhinav Kumar
2023-01-19 8:40 ` Dmitry Baryshkov
2023-01-19 10:35 ` Krzysztof Kozlowski
2023-01-20 15:54 ` Sean Paul
2023-01-21 10:16 ` Dmitry Baryshkov
2023-01-21 19:06 ` Krzysztof Kozlowski
2023-01-18 19:30 ` [PATCH v6 10/10] drm/msm: Implement HDCP 1.x using the new drm HDCP helpers Mark Yacoub
2023-01-19 11:35 ` Dmitry Baryshkov
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=20230118193015.911074-6-markyacoub@google.com \
--to=markyacoub@chromium.org \
--cc=abhinavk@codeaurora.org \
--cc=agross@kernel.org \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=ankit.k.nautiyal@intel.com \
--cc=arun.r.murthy@intel.com \
--cc=ashutosh.dixit@intel.com \
--cc=bhanuprakash.modem@intel.com \
--cc=bjorn.andersson@linaro.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hbh25y@gmail.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jani.nikula@linux.intel.com \
--cc=javierm@redhat.com \
--cc=johan+linaro@kernel.org \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jose.souza@intel.com \
--cc=konrad.dybcio@somainline.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=lyude@redhat.com \
--cc=manasi.d.navare@intel.com \
--cc=marex@denx.de \
--cc=matthew.d.roper@intel.com \
--cc=maxime@cerno.tech \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_jesszhan@quicinc.com \
--cc=quic_khsieh@quicinc.com \
--cc=quic_sbillaka@quicinc.com \
--cc=robdclark@gmail.com \
--cc=robh+dt@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=sean@poorly.run \
--cc=seanpaul@chromium.org \
--cc=stanislav.lisovskiy@intel.com \
--cc=swati2.sharma@intel.com \
--cc=swboyd@chromium.org \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=ville.syrjala@linux.intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).