From: Sean Paul <sean@poorly.run>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch, rodrigo.vivi@intel.com,
Sean Paul <seanpaul@chromium.org>
Subject: [PATCH v3 10/12] drm/i915: Use ddi_update_pipe in intel_dp_mst
Date: Fri, 17 Jan 2020 14:31:01 -0500 [thread overview]
Message-ID: <20200117193103.156821-11-sean@poorly.run> (raw)
In-Reply-To: <20200117193103.156821-1-sean@poorly.run>
From: Sean Paul <seanpaul@chromium.org>
In order to act upon content_protection property changes, we'll need to
implement the .update_pipe() hook. We can re-use intel_ddi_update_pipe
for this
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191203173638.94919-10-sean@poorly.run #v1
Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-11-sean@poorly.run #v2
Changes in v2:
-None
Changes in v3:
-None
---
drivers/gpu/drm/i915/display/intel_ddi.c | 9 +++++----
drivers/gpu/drm/i915/display/intel_dp.h | 4 ++++
drivers/gpu/drm/i915/display/intel_dp_mst.c | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 4073dd96b83e..43e935d3d86c 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4136,9 +4136,9 @@ static void intel_ddi_update_pipe_dp(struct intel_encoder *encoder,
intel_panel_update_backlight(encoder, crtc_state, conn_state);
}
-static void intel_ddi_update_pipe(struct intel_encoder *encoder,
- const struct intel_crtc_state *crtc_state,
- const struct drm_connector_state *conn_state)
+void intel_ddi_update_pipe(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state,
+ const struct drm_connector_state *conn_state)
{
struct intel_connector *connector =
to_intel_connector(conn_state->connector);
@@ -4148,7 +4148,8 @@ static void intel_ddi_update_pipe(struct intel_encoder *encoder,
conn_state->content_protection !=
DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
- if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
+ if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) &&
+ !intel_encoder_is_mst(encoder))
intel_ddi_update_pipe_dp(encoder, crtc_state, conn_state);
/*
diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 3da166054788..0a028b58a8be 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -125,4 +125,8 @@ static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
u32 intel_dp_mode_to_fec_clock(u32 mode_clock);
+void intel_ddi_update_pipe(struct intel_encoder *encoder,
+ const struct intel_crtc_state *crtc_state,
+ const struct drm_connector_state *conn_state);
+
#endif /* __INTEL_DP_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index cba68c5a80fa..975d97989d3b 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -774,6 +774,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
intel_encoder->compute_config = intel_dp_mst_compute_config;
intel_encoder->disable = intel_mst_disable_dp;
intel_encoder->post_disable = intel_mst_post_disable_dp;
+ intel_encoder->update_pipe = intel_ddi_update_pipe;
intel_encoder->pre_pll_enable = intel_mst_pre_pll_enable_dp;
intel_encoder->pre_enable = intel_mst_pre_enable_dp;
intel_encoder->enable = intel_mst_enable_dp;
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-01-17 19:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 19:30 [PATCH v3 00/12] drm/i915: Add support for HDCP 1.4 over MST connectors Sean Paul
2020-01-17 19:30 ` [PATCH v3 01/12] drm/i915: Fix sha_text population code Sean Paul
2020-01-19 15:26 ` Sasha Levin
2020-01-17 19:30 ` [PATCH v3 02/12] drm/i915: Clear the repeater bit on HDCP disable Sean Paul
2020-01-19 15:26 ` Sasha Levin
2020-01-17 19:30 ` [PATCH v3 03/12] drm/i915: WARN if HDCP signalling is enabled upon disable Sean Paul
2020-01-17 19:30 ` [PATCH v3 04/12] drm/i915: Intercept Aksv writes in the aux hooks Sean Paul
2020-01-17 19:30 ` [PATCH v3 05/12] drm/i915: Use the cpu_transcoder in intel_hdcp to toggle HDCP signalling Sean Paul
2020-01-17 19:30 ` [PATCH v3 06/12] drm/i915: Factor out hdcp->value assignments Sean Paul
2020-01-17 19:30 ` [PATCH v3 07/12] drm/i915: Protect workers against disappearing connectors Sean Paul
2020-01-17 19:30 ` [PATCH v3 08/12] drm/i915: Don't fully disable HDCP on a port if multiple pipes are using it Sean Paul
2020-02-02 19:03 ` Ramalingam C
2020-02-18 22:07 ` Sean Paul
2020-01-17 19:31 ` [PATCH v3 09/12] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul
2020-01-17 19:31 ` Sean Paul [this message]
2020-01-17 19:31 ` [PATCH v3 11/12] drm/i915: Factor out HDCP shim functions from dp for use by dp_mst Sean Paul
2020-01-17 19:31 ` [PATCH v3 12/12] drm/i915: Add HDCP 1.4 support for MST connectors Sean Paul
2020-01-27 14:06 ` [PATCH v3 00/12] drm/i915: Add support for HDCP 1.4 over " Sean Paul
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=20200117193103.156821-11-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=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: 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).