From patchwork Fri Aug 10 09:10:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1304621 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 ECF1A3FC33 for ; Fri, 10 Aug 2012 09:10:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D26F6A0EAF for ; Fri, 10 Aug 2012 02:10:30 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 105239E93F for ; Fri, 10 Aug 2012 02:10:02 -0700 (PDT) Received: by wibhm2 with SMTP id hm2so969760wib.0 for ; Fri, 10 Aug 2012 02:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=KsTkxHbHbyvr75rNeu/CMC1dS2BL1yjAG2QMjNP6EMk=; b=FpGH4ScQql7tjSdLtLNZGbgYvZl1NZZN+qbAuqoj+NNdbe6vgcZ1R18pRn1Q9tR7AJ ESoSH/llWdrenm0OYr7Lhg92nK09Ki7AwxUg3NgkAQ+iqDq9eWNr7PM9hwgjbmuO3Ok6 NPpUKX74zqG5xwsfQeL4XufP/+Q563N/ZlSdY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=KsTkxHbHbyvr75rNeu/CMC1dS2BL1yjAG2QMjNP6EMk=; b=PGAN2LPrCkaYeKifbuA+pPCOS2sQ2xbP7D3UW99zj5nxc20wmVZhsrultoP4iG5t4O 1W+NMo445vaKAG8IA0Gbx3toQYlOZfEPGGlq2PDvOercN87K0VzQHSb6Qv1xIKiUFJdf BLS5Lsd4lbomNBnA4TnbzLa6JIFU5o82cfe4oMQX9UrFPZA39JWegz7ovJyWbN/vW3Ak SCHQzp0Qpsy6mvBtwJSQd6qvqPTarcxXw2SRDBjKoS5wpSmhdq/WrKC/QA8wyACjRksx e3mAOfWwh0WE6mwNApHa6NUam92qjEHhiFHlzGwBHv2B+tBskoVw6t8lY0H5QV6z1ZS0 72Pg== Received: by 10.216.208.104 with SMTP id p82mr1273572weo.119.1344589802031; Fri, 10 Aug 2012 02:10:02 -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 k20sm6603796wiv.11.2012.08.10.02.10.00 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 02:10:01 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 10 Aug 2012 11:10:20 +0200 Message-Id: <1344589820-9753-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnrEuJugau9b7bnuNFkws6c+mln/GR3i2OdB/PaMfmsPfYQdsIxFt90vgFukq2vvtzR1xOx Cc: Daniel Vetter , LKML , stable@vger.kernel.org Subject: [Intel-gfx] [PATCH] drm/i915: ingore eDP bpc settings 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 originally been introduced to not oversubscribe the dp links in commit 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 Author: Zhenyu Wang Date: Tue Jan 12 05:38:31 2010 +0800 drm/i915: fix pixel color depth setting on eDP Since then we've fixed up the dp link bandwidth calculation code for code and should now automatically fall back to 6bpc dithering. So this is unnecessary. Furthermore it seems to break the new MacbookPro with retina display, hence let's just rip this out. Reported-by: Benoit Gschwind Cc: Benoit Gschwind Cc: Francois Rigaut Cc: Greg KH Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter Acked-by: Paul Menzel --- Testing feedback highgly welcome, and thanks for Benoit for finding out that the bpc computations are busted. -Daniel --- drivers/gpu/drm/i915/intel_display.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bddb290..ddd4db3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3755,17 +3755,6 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, continue; } - if (intel_encoder->type == INTEL_OUTPUT_EDP) { - /* Use VBT settings if we have an eDP panel */ - unsigned int edp_bpc = dev_priv->edp.bpp / 3; - - if (edp_bpc < display_bpc) { - DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc); - display_bpc = edp_bpc; - } - continue; - } - /* Not one of the known troublemakers, check the EDID */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {