From: Jani Nikula <jani.nikula@intel.com>
To: Vandita Kulkarni <vandita.kulkarni@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/dsi: Do not read the transcoder register.
Date: Tue, 19 Nov 2019 17:53:10 +0200 [thread overview]
Message-ID: <87mucryiah.fsf@intel.com> (raw)
In-Reply-To: <20191119072004.4093-1-vandita.kulkarni@intel.com>
On Tue, 19 Nov 2019, Vandita Kulkarni <vandita.kulkarni@intel.com> wrote:
> As per the Bspec, port mapping is fixed for mipi dsi.
>
> v2: Reuse the existing function (Jani)
>
> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
Pushed, thanks for the patch.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 23f00a651738..dccb94b24d14 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10577,16 +10577,21 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
> struct intel_crtc_state *pipe_config)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> struct intel_shared_dpll *pll;
> enum port port;
> u32 tmp;
>
> - tmp = I915_READ(TRANS_DDI_FUNC_CTL(pipe_config->cpu_transcoder));
> -
> - if (INTEL_GEN(dev_priv) >= 12)
> - port = TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> - else
> - port = TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + if (transcoder_is_dsi(cpu_transcoder)) {
> + port = (cpu_transcoder == TRANSCODER_DSI_A) ?
> + PORT_A : PORT_B;
> + } else {
> + tmp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
> + if (INTEL_GEN(dev_priv) >= 12)
> + port = TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + else
> + port = TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + }
>
> if (INTEL_GEN(dev_priv) >= 11)
> icelake_get_ddi_pll(dev_priv, port, pipe_config);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: Vandita Kulkarni <vandita.kulkarni@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915/dsi: Do not read the transcoder register.
Date: Tue, 19 Nov 2019 17:53:10 +0200 [thread overview]
Message-ID: <87mucryiah.fsf@intel.com> (raw)
Message-ID: <20191119155310.mmZxSXV-yVUUJI1xQTJQQlY8-hL3edByjaiog-vHf4g@z> (raw)
In-Reply-To: <20191119072004.4093-1-vandita.kulkarni@intel.com>
On Tue, 19 Nov 2019, Vandita Kulkarni <vandita.kulkarni@intel.com> wrote:
> As per the Bspec, port mapping is fixed for mipi dsi.
>
> v2: Reuse the existing function (Jani)
>
> Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>
Pushed, thanks for the patch.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 23f00a651738..dccb94b24d14 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -10577,16 +10577,21 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,
> struct intel_crtc_state *pipe_config)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> + enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
> struct intel_shared_dpll *pll;
> enum port port;
> u32 tmp;
>
> - tmp = I915_READ(TRANS_DDI_FUNC_CTL(pipe_config->cpu_transcoder));
> -
> - if (INTEL_GEN(dev_priv) >= 12)
> - port = TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> - else
> - port = TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + if (transcoder_is_dsi(cpu_transcoder)) {
> + port = (cpu_transcoder == TRANSCODER_DSI_A) ?
> + PORT_A : PORT_B;
> + } else {
> + tmp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
> + if (INTEL_GEN(dev_priv) >= 12)
> + port = TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + else
> + port = TRANS_DDI_FUNC_CTL_VAL_TO_PORT(tmp);
> + }
>
> if (INTEL_GEN(dev_priv) >= 11)
> icelake_get_ddi_pll(dev_priv, port, pipe_config);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-19 15:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 7:20 [PATCH] drm/i915/dsi: Do not read the transcoder register Vandita Kulkarni
2019-11-19 7:20 ` [Intel-gfx] " Vandita Kulkarni
2019-11-19 8:34 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-11-19 8:34 ` [Intel-gfx] " Patchwork
2019-11-19 11:55 ` ✓ Fi.CI.IGT: " Patchwork
2019-11-19 11:55 ` [Intel-gfx] " Patchwork
2019-11-19 15:53 ` Jani Nikula [this message]
2019-11-19 15:53 ` [Intel-gfx] [PATCH] " Jani Nikula
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=87mucryiah.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=vandita.kulkarni@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