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 09/12] drm/i915: Support DP MST in enc_to_dig_port() function Date: Fri, 17 Jan 2020 14:31:00 -0500 [thread overview] Message-ID: <20200117193103.156821-10-sean@poorly.run> (raw) In-Reply-To: <20200117193103.156821-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Although DP_MST fake encoders are not subclassed from digital ports, they are associated with them. Support these encoders. Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20191203173638.94919-9-sean@poorly.run #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-10-sean@poorly.run #v2 Changes in v2: -None Changes in v3: -None --- .../drm/i915/display/intel_display_types.h | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index b488e8b1478e..d7f4897a1eb9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1460,6 +1460,18 @@ static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder) } } +static inline bool intel_encoder_is_mst(struct intel_encoder *encoder) +{ + return encoder->type == INTEL_OUTPUT_DP_MST; +} + +static inline struct intel_dp_mst_encoder * +enc_to_mst(struct intel_encoder *encoder) +{ + return container_of(&encoder->base, struct intel_dp_mst_encoder, + base.base); +} + static inline struct intel_digital_port * enc_to_dig_port(struct intel_encoder *encoder) { @@ -1468,6 +1480,8 @@ enc_to_dig_port(struct intel_encoder *encoder) if (intel_encoder_is_dig_port(intel_encoder)) return container_of(&encoder->base, struct intel_digital_port, base.base); + else if (intel_encoder_is_mst(intel_encoder)) + return enc_to_mst(encoder)->primary; else return NULL; } @@ -1478,13 +1492,6 @@ conn_to_dig_port(struct intel_connector *connector) return enc_to_dig_port(intel_attached_encoder(connector)); } -static inline struct intel_dp_mst_encoder * -enc_to_mst(struct intel_encoder *encoder) -{ - return container_of(&encoder->base, struct intel_dp_mst_encoder, - base.base); -} - static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder) { return &enc_to_dig_port(encoder)->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
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 v3 09/12] drm/i915: Support DP MST in enc_to_dig_port() function Date: Fri, 17 Jan 2020 14:31:00 -0500 [thread overview] Message-ID: <20200117193103.156821-10-sean@poorly.run> (raw) In-Reply-To: <20200117193103.156821-1-sean@poorly.run> From: Sean Paul <seanpaul@chromium.org> Although DP_MST fake encoders are not subclassed from digital ports, they are associated with them. Support these encoders. Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20191203173638.94919-9-sean@poorly.run #v1 Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-10-sean@poorly.run #v2 Changes in v2: -None Changes in v3: -None --- .../drm/i915/display/intel_display_types.h | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index b488e8b1478e..d7f4897a1eb9 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1460,6 +1460,18 @@ static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder) } } +static inline bool intel_encoder_is_mst(struct intel_encoder *encoder) +{ + return encoder->type == INTEL_OUTPUT_DP_MST; +} + +static inline struct intel_dp_mst_encoder * +enc_to_mst(struct intel_encoder *encoder) +{ + return container_of(&encoder->base, struct intel_dp_mst_encoder, + base.base); +} + static inline struct intel_digital_port * enc_to_dig_port(struct intel_encoder *encoder) { @@ -1468,6 +1480,8 @@ enc_to_dig_port(struct intel_encoder *encoder) if (intel_encoder_is_dig_port(intel_encoder)) return container_of(&encoder->base, struct intel_digital_port, base.base); + else if (intel_encoder_is_mst(intel_encoder)) + return enc_to_mst(encoder)->primary; else return NULL; } @@ -1478,13 +1492,6 @@ conn_to_dig_port(struct intel_connector *connector) return enc_to_dig_port(intel_attached_encoder(connector)); } -static inline struct intel_dp_mst_encoder * -enc_to_mst(struct intel_encoder *encoder) -{ - return container_of(&encoder->base, struct intel_dp_mst_encoder, - base.base); -} - static inline struct intel_dp *enc_to_intel_dp(struct intel_encoder *encoder) { return &enc_to_dig_port(encoder)->dp; -- 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-01-17 19:31 UTC|newest] Thread overview: 42+ 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 ` [Intel-gfx] " Sean Paul 2020-01-17 19:30 ` [PATCH v3 01/12] drm/i915: Fix sha_text population code Sean Paul 2020-01-17 19:30 ` [Intel-gfx] " Sean Paul 2020-01-17 19:30 ` Sean Paul 2020-01-19 15:26 ` Sasha Levin 2020-01-19 15:26 ` [Intel-gfx] " Sasha Levin 2020-01-17 19:30 ` [PATCH v3 02/12] drm/i915: Clear the repeater bit on HDCP disable Sean Paul 2020-01-17 19:30 ` [Intel-gfx] " Sean Paul 2020-01-17 19:30 ` Sean Paul 2020-01-19 15:26 ` Sasha Levin 2020-01-19 15:26 ` [Intel-gfx] " 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 ` [Intel-gfx] " 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 ` [Intel-gfx] " 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 ` [Intel-gfx] " 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 ` [Intel-gfx] " 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 ` [Intel-gfx] " 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-01-17 19:30 ` [Intel-gfx] " Sean Paul 2020-02-02 19:03 ` Ramalingam C 2020-02-02 19:03 ` [Intel-gfx] " Ramalingam C 2020-02-18 22:07 ` Sean Paul 2020-02-18 22:07 ` [Intel-gfx] " Sean Paul 2020-01-17 19:31 ` Sean Paul [this message] 2020-01-17 19:31 ` [Intel-gfx] [PATCH v3 09/12] drm/i915: Support DP MST in enc_to_dig_port() function Sean Paul 2020-01-17 19:31 ` [PATCH v3 10/12] drm/i915: Use ddi_update_pipe in intel_dp_mst Sean Paul 2020-01-17 19:31 ` [Intel-gfx] " Sean Paul 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 ` [Intel-gfx] " 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-17 19:31 ` [Intel-gfx] " Sean Paul 2020-01-18 2:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add support for HDCP 1.4 over MST connectors (rev3) Patchwork 2020-01-18 3:18 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-01-18 3:18 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork 2020-01-20 19:46 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork 2020-01-27 14:06 ` [PATCH v3 00/12] drm/i915: Add support for HDCP 1.4 over MST connectors Sean Paul 2020-01-27 14:06 ` [Intel-gfx] " 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-10-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: 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.