From patchwork Mon Mar 3 10:18:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3753411 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 935879F1EE for ; Mon, 3 Mar 2014 10:18:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B47E120127 for ; Mon, 3 Mar 2014 10:18:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BEF74201EC for ; Mon, 3 Mar 2014 10:18:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 56695FB07F; Mon, 3 Mar 2014 02:18:28 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by gabe.freedesktop.org (Postfix) with ESMTP id E21D7FB07F for ; Mon, 3 Mar 2014 02:18:25 -0800 (PST) Received: by mail-ea0-f182.google.com with SMTP id b10so3429811eae.27 for ; Mon, 03 Mar 2014 02:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=GY426zBDKJA1X6y1V5TriTn1qYt0FJ5vLFn3Z81k0Fk=; b=OyszstEtnWdaimV+vfTSTICpbeYy6HLsjjDsGWfUdfcHRYywIOf8jM+JFR72Tetven 4cISGF984GQlo3c8yKGhbGW0yGWnSQvf6Ewo67JXezNxYb+wXPENEanYr8I5P8N8097p oRorc7URWtFuYjQ2U0Gn6q7y6fOwhjscXyEEw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GY426zBDKJA1X6y1V5TriTn1qYt0FJ5vLFn3Z81k0Fk=; b=j6MXO2egn9vSj3Mr9ZzKhbCdZ9vebio+5LFOyxK+Rl7xF0PHRjlflnrrq7ooIxk3Yv PpUFC5xokAHUaXrL6PvO3tdNe8mpIfaQR3AKUWziBCMp4brD3g8ogBXniymkpY8DgU5o rXzb2czU9US7BWcQapHjclaXJy738TfzZ66YHWg7a3c2L5vkXRaIazNpr1ZCWVmgGLPl VyxKJw944XA4R96ydgdyaebNKOwLtB0h6vNupJU/Xju69yn9mzpjXwu3UydH+StwbNCM /CGHySNwUOpl5Xd2qqpxrM26SUzWu5dkWzzWZmsMnKLnkPTdMg+yLABk0fFEFHCtSTUJ IifA== X-Gm-Message-State: ALoCoQmJ/q1TbSBqcfczIQTET2jKocgI+vCE89G93eXVNarMxUdbXwSxZohdUbjybojzORTjeerr X-Received: by 10.14.215.133 with SMTP id e5mr2460237eep.103.1393841904563; Mon, 03 Mar 2014 02:18:24 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id 43sm48127929eeh.13.2014.03.03.02.18.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Mar 2014 02:18:23 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 3 Mar 2014 11:18:10 +0100 Message-Id: <1393841890-15549-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 Cc: Daniel Vetter , peter@colberg.org Subject: [Intel-gfx] [PATCH] drm/i915: reverse dp link param selection, prefer fast over wide again X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ... it's this time of the year again. Originally we've frobbed this to fix up some regressions, but maybe our DP code improved sufficiently now that we can dare to do again what the spec recommends. This reverts commit 2514bc510d0c3aadcc5204056bb440fa36845147 Author: Jesse Barnes Date: Thu Jun 21 15:13:50 2012 -0700 drm/i915: prefer wide & slow to fast & narrow in DP configs I'm pretty sure I'll regret this patch, but otoh I expect we won't make progress here without poking the devil occasionally. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73694 Cc: peter@colberg.org Cc: Jesse Barnes Tested-by: Itai BEN YAACOV Tested-by: David En Reported-and-Tested-by: Marcus Bergner Signed-off-by: Daniel Vetter Reviewed-by: Jani Nikula Acked-by: Jesse Barnes --- 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 1ac4b11765c7..e50aadfc2184 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -909,8 +909,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, mode_rate = intel_dp_link_required(adjusted_mode->crtc_clock, bpp); - for (clock = 0; clock <= max_clock; clock++) { - for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) { + for (lane_count = 1; lane_count <= max_lane_count; lane_count <<= 1) { + for (clock = 0; clock <= max_clock; clock++) { link_clock = drm_dp_bw_code_to_link_rate(bws[clock]); link_avail = intel_dp_max_data_rate(link_clock, lane_count);