From patchwork Wed Apr 3 21:03:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2389301 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 8B81B3FD8C for ; Wed, 3 Apr 2013 21:00:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D750E6103 for ; Wed, 3 Apr 2013 14:00:36 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 68BCCE5C3D for ; Wed, 3 Apr 2013 14:00:24 -0700 (PDT) Received: by mail-ee0-f54.google.com with SMTP id e51so838416eek.41 for ; Wed, 03 Apr 2013 14:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=NFK5OHC79Js4Ir6Ncg874wRxXQ8hpBXSwynVYk0JfXg=; b=gLEBy8ntrETnJ5WqPo/7c2amwJDSaOb42M43oyrKHrJBhxT5E5qSoc9Fx/bz69nDLg 1Dg5veywsa39nFSaEu9vePk1bxFfE5ebqO4P2SlydhvJ3a7ni/ZikCUEchZF0J/jRco3 ltPlYp+BpE8hNfEGHAtOc07b4QaIutZUED6ZA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=NFK5OHC79Js4Ir6Ncg874wRxXQ8hpBXSwynVYk0JfXg=; b=b5vatSXMBlgVXGfgxyjnf1usvS24BfnpR7Ve3lBUwZkGbKjuo9zWxtEdKj/8Zru7CV sbcXDrS0Vm2IXMwZUrdvoSQGrbzYEig2VCJKEYA3K0j4fMpA7UsW0uPcQ7kaOHa7Ksj8 7sCHfhOTMNRdzL8X+TUUAbquksIbPSD7dxKH/ifoxziO5h/AlsyAoszLqbLWJpgcAfYD MB5EV8QCUdszAoDoOg25x1G+VxQddBs+qPdlUBQaKhqvOiuVbFLOJMDdUcYGGEjbKHIs 2rMbp865M45xR1q/ODLTGQIwRyNLqUO70PFuA8XlBSTglRj45uhtfTMe/dCTAezDbz9G KnzQ== X-Received: by 10.14.218.71 with SMTP id j47mr6007268eep.28.1365022823503; Wed, 03 Apr 2013 14:00:23 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id s3sm9141955eem.4.2013.04.03.14.00.21 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 14:00:22 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 3 Apr 2013 23:03:02 +0200 Message-Id: <1365022982-28745-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnW1oJjkHxNGGfgw+jwopIFy0RKIyZgZ4Y8YYn+k4Ha63GbvdZW3dMkQreMbU0OdQamNe5Q Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: re-add eDP bpp clamping notice 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org This has been lost in my recent bpp handling rework in commit 4e53c2e010e531b4a014692199e978482d471c7e Author: Daniel Vetter Date: Wed Mar 27 00:44:58 2013 +0100 drm/i915: precompute pipe bpp before touching the hw Cc: Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index c5cfec3..58ba0a0 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -741,8 +741,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, /* Walk through all bpp values. Luckily they're all nicely spaced with 2 * bpc in between. */ bpp = min_t(int, 8*3, pipe_config->pipe_bpp); - if (is_edp(intel_dp) && dev_priv->edp.bpp) + if (is_edp(intel_dp) && dev_priv->edp.bpp) { + DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", + bpp, dev_priv->edp.bpp); bpp = min_t(int, bpp, dev_priv->edp.bpp); + } for (; bpp >= 6*3; bpp -= 2*3) { mode_rate = intel_dp_link_required(target_clock, bpp);