From patchwork Wed Mar 4 06:00:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1248826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=AmEGaQaj; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48XNY00tD1z9sST; Wed, 4 Mar 2020 17:01:08 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j9N5c-0007yV-S1; Wed, 04 Mar 2020 06:01:04 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j9N5b-0007xK-K6 for kernel-team@lists.ubuntu.com; Wed, 04 Mar 2020 06:01:03 +0000 Received: by mail-pf1-f196.google.com with SMTP id i13so405681pfe.3 for ; Tue, 03 Mar 2020 22:01:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=v9qrl3UuqPJuA3NsKfOkY4NA+3jX27RHCGYbcADR9qg=; b=AmEGaQajAQRKda+jvzCKgwhE0p41q22CPzmcbyvKxFVO1El5DUHOvvtNqyu4D3253p 9A/uHvuZ3aM2AEFAb9qc8UeVZxXDE4TzN25Ta0wlOCB5FaRCxKCmjmuZbipssi2Kktza t/JO+VSA3ac/dtvq/xSDzCBKyGnJseYo+KUNocOaKDs3fC+x2ikPMD8UxTNxRiCTO0kc n0fQEoavgqVmy2OCsqUsd/4TvDmGyxcqQszyxFSb1VD9cVq2H4+bK5yi0YCTzw+SSbSF Nd8EU8WhcAM7kq/AAqyTgHkdgty0kH2+KerN5hEYjnyZWJr+xQkDZ5Sog73SIsZmsgwH 8cLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=v9qrl3UuqPJuA3NsKfOkY4NA+3jX27RHCGYbcADR9qg=; b=ZIzzWO1clS0pCR4+fCZWpVh9K/CG6gGZr0UaW4H+tvFDFByh9mYy0uFqpSJ9dy8Hxr SJmUqhHAY9GH21DRneQXK2SMEQXeglarp6u7NutqddOr/1CZLM5FTgtXslfECifbEMDm 9jZ55pxGb7dPNCj+ybc+/jLLAQMi7wu46bD6tSgzmFXlkCrUpS9Z/l/Agce/M6G/7R5C ijCftNRTJFeknvUu7/Z7M+ixa6rcNZmFvW/ue0MfugRme4qbOz9DFGW0rbHnmd+3R2As T77qmYzJ/ngZc81NHkyg1RIoT5fvBh6iHvT8YE+ma+Edrcu42SEuzPKwA4w7oxGGA3XM ncZA== X-Gm-Message-State: ANhLgQ27pdNx7GaNxcqN8RjGVk8eis9SuT2aN358BBBXoCJS1bcpsLhS nRPfKRSuffK+IjA1P3QGMFafHXau X-Google-Smtp-Source: ADFU+vtGUV6a7T9Q5yl5gQV7D/bVKfVeDJwDTPvvKIz9hoNdMa5Yd3fAsmtbj6Y8RNsXvi/LKLUa5w== X-Received: by 2002:a63:d4d:: with SMTP id 13mr1097313pgn.376.1583301661667; Tue, 03 Mar 2020 22:01:01 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id na18sm881347pjb.9.2020.03.03.22.01.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Mar 2020 22:01:01 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/5][SRU][F] Revert "UBUNTU: SAUCE: drm/i915: Force DPCD backlight mode on X1 Extreme 2nd Gen 4K AMOLED panel" Date: Wed, 4 Mar 2020 14:00:47 +0800 Message-Id: <20200304060055.5776-3-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304060055.5776-1-acelan.kao@canonical.com> References: <20200304060055.5776-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1861521 This reverts commit 163215682f9be577adefacdc97ed3cd45af849e2. Signed-off-by: AceLan Kao --- drivers/gpu/drm/drm_dp_helper.c | 4 ---- drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 10 ++-------- include/drm/drm_dp_helper.h | 8 -------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index f1f14f4144e3..ffc68d305afe 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -1260,10 +1260,6 @@ static const struct dpcd_quirk dpcd_quirk_list[] = { { OUI(0x00, 0x10, 0xfa), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_NO_PSR) }, /* CH7511 seems to leave SINK_COUNT zeroed */ { OUI(0x00, 0x00, 0x00), DEVICE_ID('C', 'H', '7', '5', '1', '1'), false, BIT(DP_DPCD_QUIRK_NO_SINK_COUNT) }, - /* Optional 4K AMOLED panel in the ThinkPad X1 Extreme 2nd Generation - * only supports DPCD backlight controls, despite advertising otherwise - */ - { OUI(0xba, 0x41, 0x59), DEVICE_ID_ANY, false, BIT(DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT) }, }; #undef OUI diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c index 3d61260b08ad..87b59db9ffe3 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -325,17 +325,11 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector) int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) { struct intel_panel *panel = &intel_connector->panel; - struct intel_dp *intel_dp = - enc_to_intel_dp(&intel_connector->encoder->base); - struct drm_i915_private *dev_priv = - to_i915(intel_connector->base.dev); + struct drm_i915_private *dev_priv = to_i915(intel_connector->base.dev); if (i915_modparams.enable_dpcd_backlight == 0 || (i915_modparams.enable_dpcd_backlight == -1 && - dev_priv->vbt.backlight.type != - INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE && - !drm_dp_has_quirk(&intel_dp->desc, - DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT))) + dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE)) return -ENODEV; if (!intel_dp_aux_display_control_capable(intel_connector)) diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index cd22d632fd74..8364502f92cf 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1434,14 +1434,6 @@ enum drm_dp_quirk { * The driver should ignore SINK_COUNT during detection. */ DP_DPCD_QUIRK_NO_SINK_COUNT, - /** - * @DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT: - * - * The device is telling the truth when it says that it uses DPCD - * backlight controls, even if the system's firmware disagrees. - * The driver should honor the DPCD backlight capabilities advertised. - */ - DP_DPCD_QUIRK_FORCE_DPCD_BACKLIGHT, }; /**