From patchwork Thu May 26 14:39:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mario Kleiner X-Patchwork-Id: 9137043 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55388607D7 for ; Thu, 26 May 2016 14:39:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4990628066 for ; Thu, 26 May 2016 14:39:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E46E281D4; Thu, 26 May 2016 14:39:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED39F28066 for ; Thu, 26 May 2016 14:39:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9B6E6E7AD; Thu, 26 May 2016 14:39:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id A75D76E73F for ; Thu, 26 May 2016 14:39:36 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a136so6067165wme.0 for ; Thu, 26 May 2016 07:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k0gcZNfodePkjrufLk6MBr4sxBXGz27etewsBVcLdqs=; b=gedAV2aniXUU4tU6anQVH8eAxX/NWoRf+6L+1EACIAF8ZgY2G3OEdoH2JW4bqTVslu JFfYA6xEuQMsQQGTYkQcoxf+KsGI9G4X0cpHMXEPadZ78ZujyUapF4oi33MuQ7G6u18f vLUiVZxQl99M2/I8NE+dq/yYUy6PlFzz7j0E69Ncp7VO32hO2Neyx5H4SkjNNkfZdBfq n+zujGmH4Nby+QVGUxpDLHv20sXXQzLgPyxRNQqVB3qtYWwskGJN1yz3+7xV7esUcXu4 lgh5hvk45xI96711k/Q530UK/ZoU+0ZTTepeEEU93iromxymaTJ2nE9J8wzonSgP49ZB Jh2g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=k0gcZNfodePkjrufLk6MBr4sxBXGz27etewsBVcLdqs=; b=Jgwf9k0ce9Txq9g+IUP1twfMTsbAB9T8zEsHqK+zufWhhjQjbj+teMOKKVaqgVfOHZ ByqT16RAc1vjavm/+Bv/g/OoXYMSs9ug10+MN5+sxJEiEaPUX/9E9/oFcp62Ibc8Ua9m a/6eWMoR+4VjhBO01IiFQCjNhz8JlasSqR91tokBtqLYbjv8zTgcDzp57Xq7nvAl2FYz c6wjzUTMs1IcO7yIfaBdxmI/Cwqq5WeBRSdHDpL6JOHzlQPnIs/BCB7O1d9j2VjHsMEF 2yuItxkDhpS2H0gT1H1/vrRnf/sZ3QkO7geS0e/LFWX7YOe28p6UGA4vpdUulRQzfqky tu0w== X-Gm-Message-State: ALyK8tLXXfd46LA0BC4jYwgKhya8WFrVmy88qSFk0IFODyvlCJVgXrd2CTAptGWHztUnWg== X-Received: by 10.28.173.66 with SMTP id w63mr4370668wme.14.1464273574699; Thu, 26 May 2016 07:39:34 -0700 (PDT) Received: from twisty.fritz.box (x5f719531.dyn.telefonica.de. [95.113.149.49]) by smtp.gmail.com with ESMTPSA id a128sm3853849wme.16.2016.05.26.07.39.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 May 2016 07:39:33 -0700 (PDT) From: Mario Kleiner To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/i915/dp: Revert "drm/i915/dp: fall back to 18 bpp when sink capability is unknown" Date: Thu, 26 May 2016 16:39:03 +0200 Message-Id: <1464273544-23834-2-git-send-email-mario.kleiner.de@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1464273544-23834-1-git-send-email-mario.kleiner.de@gmail.com> References: <1464273544-23834-1-git-send-email-mario.kleiner.de@gmail.com> MIME-Version: 1.0 Cc: Daniel Vetter , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 013dd9e03872 ("drm/i915/dp: fall back to 18 bpp when sink capability is unknown") This commit introduced a regression into stable kernels, as it reduces output color depth to 6 bpc for any video sink connected to a Displayport connector if that sink doesn't report a specific color depth via EDID, or if our EDID parser doesn't actually recognize the proper bpc from EDID. Affected are active DisplayPort->VGA converters and active DisplayPort->DVI converters. Both should be able to handle 8 bpc, but are degraded to 6 bpc with this patch. The reverted commit was meant to fix Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=105331 A followup patch implements a fix for that specific bug, which is caused by a faulty EDID of the affected DP panel by adding a new EDID quirk for that panel. DP 18 bpp fallback handling and other improvements to DP sink bpc detection will be handled for future kernels in a separate series of patches. Please backport to stable. Signed-off-by: Mario Kleiner Acked-by: Jani Nikula Cc: stable@vger.kernel.org Cc: Ville Syrjälä Cc: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 46f9be3..3a57fa1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12066,21 +12066,11 @@ connected_sink_compute_bpp(struct intel_connector *connector, pipe_config->pipe_bpp = connector->base.display_info.bpc*3; } - /* Clamp bpp to default limit on screens without EDID 1.4 */ - if (connector->base.display_info.bpc == 0) { - int type = connector->base.connector_type; - int clamp_bpp = 24; - - /* Fall back to 18 bpp when DP sink capability is unknown. */ - if (type == DRM_MODE_CONNECTOR_DisplayPort || - type == DRM_MODE_CONNECTOR_eDP) - clamp_bpp = 18; - - if (bpp > clamp_bpp) { - DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of %d\n", - bpp, clamp_bpp); - pipe_config->pipe_bpp = clamp_bpp; - } + /* Clamp bpp to 8 on screens without EDID 1.4 */ + if (connector->base.display_info.bpc == 0 && bpp > 24) { + DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n", + bpp); + pipe_config->pipe_bpp = 24; } }