public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] Revert "drm/i915: reverse dp link param selection, prefer fast over wide again"
Date: Mon, 14 Jul 2014 09:02:23 +0200	[thread overview]
Message-ID: <20140714070223.GC15237@phenom.ffwll.local> (raw)
In-Reply-To: <1405299879-20093-1-git-send-email-airlied@gmail.com>

On Mon, Jul 14, 2014 at 11:04:39AM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied@redhat.com>
> 
> This reverts commit 38aecea0ccbb909d635619cba22f1891e589b434.
> 
> This breaks Haswell Thinkpad + Lenovo dock in SST mode with a HDMI monitor attached.
> 
> Before this we can 1920x1200 mode, after this we only ever get 1024x768, and
> a lot of deferring.
> 
> This didn't revert clean, but this should be fine.
> 
> bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1117008
> Cc: stable@vger.kernel.org # v3.15
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Ugh, painful. Iirc your revert here wins on first-regression grounds, but
I'd like to first try whether we can do better.

Paulo, can you please take a look? Iirc it's a hsw, but I guess Dave can
throw logs at you.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_dp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 2a00cb8..61963d3 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -833,8 +833,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
>  		mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock,
>  						   bpp);
>  
> -		for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) {
> -			for (clock = min_clock; clock <= max_clock; clock++) {
> +		for (clock = min_clock; clock <= max_clock; clock++) {
> +			for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<= 1) {
>  				link_clock = drm_dp_bw_code_to_link_rate(bws[clock]);
>  				link_avail = intel_dp_max_data_rate(link_clock,
>  								    lane_count);
> -- 
> 1.9.3
> 
> _______________________________________________
> 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:[~2014-07-14  7:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14  1:04 [PATCH] Revert "drm/i915: reverse dp link param selection, prefer fast over wide again" Dave Airlie
2014-07-14  7:02 ` Daniel Vetter [this message]
2014-07-14 21:18 ` 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=20140714070223.GC15237@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=airlied@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox