From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll
Date: Fri, 8 Jul 2016 12:58:47 +0300 [thread overview]
Message-ID: <20160708095847.GP4329@intel.com> (raw)
In-Reply-To: <1467892557-24546-1-git-send-email-maarten.lankhorst@linux.intel.com>
On Thu, Jul 07, 2016 at 01:55:43PM +0200, Maarten Lankhorst wrote:
> No idea if it supports it, but this is the minimum required from get_dpll.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index 5c1f2d235ffa..655a5b382cf9 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -1535,7 +1535,8 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
>
> vco = best_clock.vco;
> } else if (encoder->type == INTEL_OUTPUT_DP ||
> - encoder->type == INTEL_OUTPUT_EDP) {
> + encoder->type == INTEL_OUTPUT_EDP ||
> + encoder->type == INTEL_OUTPUT_DP_MST) {
> int i;
>
> clk_div = bxt_dp_clk_val[0];
> @@ -1611,7 +1612,12 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
> crtc_state->dpll_hw_state.pcsdw12 =
> LANESTAGGER_STRAP_OVRD | lanestagger;
>
> - intel_dig_port = enc_to_dig_port(&encoder->base);
> + if (encoder->type == INTEL_OUTPUT_DP_MST) {
> + struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
> +
> + intel_dig_port = intel_mst->primary;
> + } else
> + intel_dig_port = enc_to_dig_port(&encoder->base);
We still have intel_ddi_get_encoder_port(), so maybe use it?
>
> /* 1:1 mapping between ports and PLLs */
> i = (enum intel_dpll_id) intel_dig_port->port;
> --
> 2.5.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-07-08 9:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 11:55 [PATCH 01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 02/15] drm/i915: Pass atomic state to crtc enable/disable functions Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 03/15] drm/i915: Remove unused mode_set hook from encoder Maarten Lankhorst
2016-07-08 10:19 ` Ville Syrjälä
2016-07-07 11:55 ` [PATCH 04/15] drm/i915: Walk over encoders in crtc enable/disable using atomic state Maarten Lankhorst
2016-07-08 10:30 ` Ville Syrjälä
2016-07-11 4:54 ` Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 05/15] drm/i915: Pass crtc_state and connector_state to encoder functions Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 06/15] drm/i915: Make encoder->compute_config take the connector state Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 07/15] drm/i915: Remove unused loop from intel_dp_mst_compute_config Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 08/15] drm/i915: Convert intel_crt to use atomic state Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 09/15] drm/i915: Convert intel_dvo " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 10/15] drm/i915: Convert intel_dsi " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 11/15] drm/i915: Convert intel_sdvo " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 12/15] drm/i915: Convert intel_lvds " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 13/15] drm/i915: Convert intel_dp_mst " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 14/15] drm/i915: Convert intel_dp " Maarten Lankhorst
2016-07-07 11:55 ` [PATCH 15/15] drm/i915: Use more atomic state in intel_color.c Maarten Lankhorst
2016-07-07 12:23 ` ✗ Ro.CI.BAT: warning for series starting with [01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll Patchwork
2016-07-08 9:58 ` Ville Syrjälä [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-08-09 15:03 [PATCH 00/15] drm/i915: Use connector atomic state in encoders Maarten Lankhorst
2016-08-09 15:04 ` [PATCH 01/15] drm/i915: handle DP_MST correctly in bxt_get_dpll Maarten Lankhorst
2016-08-18 13:17 ` Daniel Vetter
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=20160708095847.GP4329@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@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