All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 01/12] drm/i915: Grab the pixel clock from adjusted_mode not requested_mode
Date: Mon, 2 Sep 2013 20:38:16 +0200	[thread overview]
Message-ID: <20130902183816.GA9374@phenom.ffwll.local> (raw)
In-Reply-To: <1378145619-22655-2-git-send-email-ville.syrjala@linux.intel.com>

On Mon, Sep 02, 2013 at 09:13:28PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> intel_crtc_compute_config() and i9xx_set_pipeconf() attempt to get
> the current pixel clock from requested_mode. requested_mode.clock may
> be totally bogus, so the clock should come from adjusted_mode.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ecb8b52..cab1319 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4124,8 +4124,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
>  
>  	if (HAS_PCH_SPLIT(dev)) {
>  		/* FDI link clock is fixed at 2.7G */
> -		if (pipe_config->requested_mode.clock * 3
> -		    > IRONLAKE_FDI_FREQ * 4)
> +		if (adjusted_mode->clock * 3 > IRONLAKE_FDI_FREQ * 4)

Note quite: The fdi dotclock is the adjusted mode's clock but with the
pixel multiplier _not_ taken into account. See
ironlake_fdi_compute_config. Maybe we need a fdi_dotclock_from_pipe_config
helper function?o

Otoh the ironlake_fdi_compute_config will do the right thing no matter
what and even takes into account things like cpu edp or shared fdi b/c
lanes. So I think we should just ditch this check here ;-)
-Daniel

>  			return -EINVAL;
>  	}
>  
> @@ -4812,7 +4811,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc)
>  		 * XXX: No double-wide on 915GM pipe B. Is that the only reason for the
>  		 * pipe == 0 check?
>  		 */
> -		if (intel_crtc->config.requested_mode.clock >
> +		if (intel_crtc->config.adjusted_mode.clock >
>  		    dev_priv->display.get_display_clock_speed(dev) * 9 / 10)
>  			pipeconf |= PIPECONF_DOUBLE_WIDE;
>  	}
> -- 
> 1.8.1.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

  reply	other threads:[~2013-09-02 18:38 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-02 18:13 [PATCH 00/12] drm/i915: pipe_config, adjusted_mode vs. requested_mode, etc ville.syrjala
2013-09-02 18:13 ` [PATCH 01/12] drm/i915: Grab the pixel clock from adjusted_mode not requested_mode ville.syrjala
2013-09-02 18:38   ` Daniel Vetter [this message]
2013-09-03 10:01     ` Ville Syrjälä
2013-09-03 11:23       ` Daniel Vetter
2013-09-03 12:08         ` Ville Syrjälä
2013-09-03 13:45           ` Daniel Vetter
2013-09-03 10:31     ` [PATCH] drm/i915: Kill IRONLAKE_FDI_FREQ check ville.syrjala
2013-09-03 11:24       ` Daniel Vetter
2013-09-02 18:13 ` [PATCH 02/12] drm/i915: Use adjusted_mode->clock in lpt_program_iclkip ville.syrjala
2013-09-02 18:13 ` [PATCH 03/12] drm/i915: Use adjusted_mode in HDMI 12bpc clock check ville.syrjala
2013-09-02 18:39   ` Daniel Vetter
2013-09-02 19:05     ` Ville Syrjälä
2013-09-03  7:50       ` Daniel Vetter
2013-09-03  9:33         ` [PATCH] drm/i915: Document the use of requested_mode, adjusted_mode, and pipe_src_{w, h} ville.syrjala
2013-09-02 18:13 ` [PATCH 04/12] drm/i915: Use adjusted_mode in intel_update_fbc() ville.syrjala
2013-09-02 18:13 ` [PATCH 05/12] drm/i915: Use adjusted_mode appropriately when computing watermarks ville.syrjala
2013-09-02 18:13 ` [PATCH 06/12] drm/i915: Check the clock from adjusted mode in intel_crtc_active() ville.syrjala
2013-09-02 18:13 ` [PATCH 07/12] drm/i915: Use adjusted_mode when checking conditions for PSR ville.syrjala
2013-09-02 18:13 ` [PATCH 08/12] drm/i915: Make intel_crtc_active() available outside intel_pm.c ville.syrjala
2013-09-02 18:42   ` Daniel Vetter
2013-09-02 19:46     ` [PATCH v2] " ville.syrjala
2013-09-02 18:13 ` [PATCH 09/12] drm/i915: Use pipe config in sprite code ville.syrjala
2013-09-02 18:13 ` [PATCH 10/12] drm/i915: Use adjusted_mode in DSI PLL calculations ville.syrjala
2013-09-02 18:13 ` [PATCH 11/12] drm/i915: Add explicit pipe src size to pipe config ville.syrjala
2013-09-02 18:46   ` Daniel Vetter
2013-09-02 19:11     ` Ville Syrjälä
2013-09-03  7:52       ` Daniel Vetter
2013-09-03  9:32         ` Ville Syrjälä
2013-09-02 18:13 ` [PATCH 12/12] drm/i915: Fix pipe config warnings when dealing with LVDS fixed mode ville.syrjala
2013-09-02 18:44   ` 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=20130902183816.GA9374@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@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 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.