From: Ander Conselvan de Oliveira <conselvan2@gmail.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types
Date: Tue, 04 Nov 2014 11:35:14 +0200 [thread overview]
Message-ID: <54589DD2.6070302@gmail.com> (raw)
In-Reply-To: <1415022024-27863-2-git-send-email-daniel.vetter@ffwll.ch>
On 11/03/2014 03:40 PM, Daniel Vetter wrote:
> More concise. Noticed while reviewing Ander's patch which touched a
> lot of the pipe_has_type checks.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 5eb12ed11df5..f7e751bcccb1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3784,9 +3784,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
> intel_fdi_normal_train(crtc);
>
> /* For PCH DP, enable TRANS_DP_CTL */
> - if (HAS_PCH_CPT(dev) &&
> - (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT) ||
> - intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_EDP))) {
> + if (HAS_PCH_CPT(dev) && intel_crtc->config.has_dp_encoder) {
> u32 bpc = (I915_READ(PIPECONF(pipe)) & PIPECONF_BPC_MASK) >> 5;
> reg = TRANS_DP_CTL(pipe);
> temp = I915_READ(reg);
> @@ -5865,8 +5863,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
> vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
> 0x00d0000f);
>
> - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP) ||
> - intel_pipe_has_type(crtc, INTEL_OUTPUT_DISPLAYPORT)) {
> + if (crtc->config.has_dp_encoder) {
> /* Use SSC source */
> if (pipe == PIPE_A)
> vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
> @@ -6056,7 +6053,7 @@ static void i9xx_update_pll(struct intel_crtc *crtc,
> if (is_sdvo)
> dpll |= DPLL_SDVO_HIGH_SPEED;
>
> - if (intel_pipe_will_have_type(crtc, INTEL_OUTPUT_DISPLAYPORT))
> + if (crtc->config.has_dp_encoder)
crtc->new_config ?
> dpll |= DPLL_SDVO_HIGH_SPEED;
>
> /* compute bitmask from p1 value */
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-11-04 9:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-03 13:40 [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Daniel Vetter
2014-11-03 13:40 ` [PATCH 2/2] drm/i915: Check pipe_config.has_dp_encoder instead of encoder types Daniel Vetter
2014-11-04 9:35 ` Ander Conselvan de Oliveira [this message]
2014-11-04 10:26 ` [PATCH] " Daniel Vetter
2014-11-03 13:49 ` [PATCH 1/2] drm/i915: Simplify the pfit check in the fastboot hack Jani Nikula
2014-11-03 14:45 ` 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=54589DD2.6070302@gmail.com \
--to=conselvan2@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=intel-gfx@lists.freedesktop.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 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.