From patchwork Sun Mar 30 17:49:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Obbard X-Patchwork-Id: 14032984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51D25C28B20 for ; Sun, 30 Mar 2025 17:49:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B05A310E32A; Sun, 30 Mar 2025 17:49:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UBGmsunL"; dkim-atps=neutral Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C8D610E32A for ; Sun, 30 Mar 2025 17:49:48 +0000 (UTC) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so25592455e9.1 for ; Sun, 30 Mar 2025 10:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743356987; x=1743961787; darn=lists.freedesktop.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=i5USGsww5N5Kq0vLfinvKo+QKTveZgSU6cSQ9ak/gNE=; b=UBGmsunLD8dkPBs8MBl7HowEIoqKRy3Vn/87nsgTSL1rmcjAcCT01q2K55TVamGSgM TzvVpqQSlHEBMfKAEizynSbHLDX+7pS34FjSH65uLjQMInuBo7cQ0DqpuVslsJwdcQDt YuVZ720Bxl7viSSzipjPbvOU8VZoTp7bUSjy8HKwct5tPNI2BPzRvFmv2mqRyhRa/e3Y amj3f6WLfndRLJ1XSCppuK4caxCW9jTZmOXn0E7QkUMqfoxYnb3hG3rijm0IpCjvTz3y IJWzICv94AGnttl4/1rlqoFv96Qtriwf/JPdsDXVyWdLQeBIGkN/ffHILmEurkc6HYsM Efog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743356987; x=1743961787; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=i5USGsww5N5Kq0vLfinvKo+QKTveZgSU6cSQ9ak/gNE=; b=djCZplE/cDYHuI6lqGpyAHlnN9N219oSH1HqdBxVljN5PCCwn17zoZw6CgJOrfdfn3 EpoO7KccahSGY7WuM+FXBDDh0XPKjdc7Rgz7dokwUrHNKytnkwUjD4EZkdlo1yi68M4Z P9w77oha/sLahZ7cAheMDeop+DegpCRbiBHb54si3SaygbYH3jHJaw2qrETzpSH9vkWd SYeaxXmvKzVP5AmlpJGL7sJoiOUQwB4brJKa0Pc64DlOIb8GfLGuOsm7T4khr/bI+7gB zIBqiWHHLwfmnloJAOy1R8btMv7GO2bZLA2XpVn5Wo3OKfflRgFwjMNKXXcCAhyAekkf KZFQ== X-Gm-Message-State: AOJu0Yyf0NEGB1uXTyRlXr/l/4rZdOWp6BiwQvFzo2k2P3cokEziOc8Y 9I1OrVuthZFYO4g9TEk6oLjFsPUWdxRqAtysuMgNp3W3/R04O/61TCiM+gZoeOY= X-Gm-Gg: ASbGncvW5wHmCcl3vfg8UtDZWJdjzsAtZSPvnNe2BJkusp1wwZC88eI3/2EItgkP5Kj D5hbHlpICdXCH099qqwHA3lt1Io2A2lGN42/vMg8vKJyFeIZy+B7/EwN7RicxCyf/b4fP1EeBjd 5kbFod/CxgcM2b1DCYxgXyeleU3283CRU14Qrm+y0dJ/Tc/Zb4bPTdOxkF+VXcq2n/zbZgjncbK PCpCsJAEzlaknvRIo1t0KnPp18WZpaJF9qw8gLGIWLEb6NhDbRWZjN+FZfeMGjLQBLVrTS7f8GC wsgCKU20NOJUxatwUDvCsPRd/uQngW26IAK7GOsQ6PyGfO2xOKWi7SS0 X-Google-Smtp-Source: AGHT+IEYLK445Y/zgB7+1Y6TO03yznq3naIzTBs/Sb5bDYqFKZU8hEvFN4VaBTPIuiCN/06rWIoCmw== X-Received: by 2002:a05:600c:5108:b0:43c:fe15:41d4 with SMTP id 5b1f17b1804b1-43db6248b78mr48210495e9.18.1743356986564; Sun, 30 Mar 2025 10:49:46 -0700 (PDT) Received: from localhost ([2a00:23c8:b70a:ae01:9cf7:b69:fc50:980f]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43d830f5ea4sm142507725e9.25.2025.03.30.10.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Mar 2025 10:49:46 -0700 (PDT) From: Christopher Obbard Date: Sun, 30 Mar 2025 18:49:40 +0100 Subject: [PATCH v5] drm/dp: clamp PWM bit count to advertised MIN and MAX capabilities MIME-Version: 1.0 Message-Id: <20250330-wip-obbardc-qcom-t14s-oled-panel-brightness-v5-1-25083d9732fc@linaro.org> X-B4-Tracking: v=1; b=H4sIADOE6WcC/6XNsW7DIBSF4VeJmHurCxiMO+U9og5grm0kF1yw3 FaR3704U6JObcdzhu+/skI5UGEvpyvLtIUSUqxDPZ1YP9k4EgRfNxMoFErRwkdYIDlns+/hvU9 vsPKmQJrJw2IjzeByGKc1UinQoECjldPKIKvikmkIn7fa5bXuKZQ15a9bfBPH+7fOJoAD176XR Iii1ec5RJvTc8ojO0KbvMMl/g6XB660Qe671hr7A2/+gTcVN4oG7Dru/GAe8H3fvwGkYZAdoQE AAA== X-Change-ID: 20250327-wip-obbardc-qcom-t14s-oled-panel-brightness-4020865b6580 To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Dmitry Baryshkov Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Johan Hovold , Rui Miguel Silva , Abel Vesa , Christopher Obbard X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5452; i=christopher.obbard@linaro.org; h=from:subject:message-id; bh=k2WStpzaSUTMJxzO4XEqgL2lzxzZWdjGouOPjYJ3wx0=; b=owEBbQKS/ZANAwAKAWNNxPBocEb4AcsmYgBn6YQ2lqnpa3jCVgm6D846L+t3xu4phENAAvBeK UrK/CBz5AaJAjMEAAEKAB0WIQTxi9yLbCX5CqI9UXRjTcTwaHBG+AUCZ+mENgAKCRBjTcTwaHBG +FcyEACOiabeX6guwtfWuBjGGoAJln4f2Olg0rP1qh64CCOiH+gVYMMRGXkoBYL5zrKkOww0mHC EKGbq6rWH3AzyJRtyhLK1qOYAUJ5lk7xt/FFP7K/evoLQW5LefLTq3CLF+c75ezkrZICNSx1cqm rMFrTqPkRWZzSI23CFKuRriOK3+ruYffB5Bom7GdcZ1uRxC1IHQlssl04l4Zn5rVKOI0qVfz1Ca YL1Kjj8tW3XnZo1t6IIpKdhkFDKQtF5GpJelVz+gEOtmj5QFZFANgvHNf8RiFDC5XUAVVd3PguA LjiIEyZ3O3h3KHekqKRw6FhV+tYOQ2yVgX8Zap7FQ1b+B8EjaSFiYT3j/rBW9mcsvlwXIGYu5L/ Cl3KTE/JoDZ895mp5JWK7G0juYYtQ16MFlmk7L2Ohbo4eXh1Jao/lKMGVschWQVcchyuPz2h/wY 9fwiTFBN/jns+QGoWLJkwcHREmUucaZ0mDE78gNwoq6Wx/oDmZ1ZU9IlGgm/8MKkr6W/nsn3R5u kVAaC2RDW8UV/fDYm3trsLFaBpQ8Sea0dN3QOlrQgOqzQyE4HyCTcoiI+l894mOLZ8DKGRQuH6k i+zBFonwW9hXXcY6yo2NviQqP9CTxd9NUaa3J9g7kbNhF8hDhD5NJWIc1B8Ud8Yrst5s/WC578P cXPSqLYOk/JXUWQ== X-Developer-Key: i=christopher.obbard@linaro.org; a=openpgp; fpr=F18BDC8B6C25F90AA23D5174634DC4F0687046F8 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 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" According to the eDP specification (VESA Embedded DisplayPort Standard v1.4b, Section 3.3.10.2), if the value of DP_EDP_PWMGEN_BIT_COUNT is less than DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, the sink is required to use the MIN value as the effective PWM bit count. This commit updates the logic to clamp the reported DP_EDP_PWMGEN_BIT_COUNT to the range defined by DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN and _CAP_MAX. As part of this change, the behavior is modified such that reading _CAP_MIN and _CAP_MAX registers is now required to succeed. Before reading these registers was optional. This ensures correct handling of eDP panels that report a zero PWM bit count but still provide valid non-zero MIN and MAX capability values. Without this clamping, brightness values may be interpreted incorrectly, leading to a dim or non-functional backlight. For example, the Samsung ATNA40YK20 OLED panel used in the Lenovo ThinkPad T14s Gen6 (Snapdragon) reports a PWM bit count of 0, but supports AUX backlight control and declares a valid 11-bit range. Clamping ensures brightness scaling works as intended on such panels. Co-developed-by: Rui Miguel Silva Signed-off-by: Rui Miguel Silva Signed-off-by: Christopher Obbard --- Changes in v5: - Correctly check return value when reading PWMGEN_BIT_COUNT_CAP_MIN and _CAP_MAX. - Link to v4: https://lore.kernel.org/r/20250330-wip-obbardc-qcom-t14s-oled-panel-brightness-v4-1-85ef0991bdf8@linaro.org Changes in v4: - Remove unrelated whitespace changes. - Remove unrelated commit change. - Add note to commit message about changing read of PWMGEN_BIT_COUNT_CAP_MIN and _CAP__MAX from optional to required. - Link to v3: https://lore.kernel.org/r/20250330-wip-obbardc-qcom-t14s-oled-panel-brightness-v3-1-156801d97a8a@linaro.org Changes in v3: - Properly rebase patch on top of latest version of drm-misc-next. - Make patch more generic by clamping PWM bit count to advertised MIN and MAX capabilities (suggested by Dmitry). - Link to v2: https://lore.kernel.org/r/20250327-wip-obbardc-qcom-t14s-oled-panel-brightness-v2-1-16dc3ee00276@linaro.org Changes in v2: - Split backlight brightness patch from T14s OLED enablement series. - Use PWMGEN_CAP_MIN rather than MAX (Dmitry). - Rework commit message to reference eDP spec. - Rebase on drm-misc-next. - Link to v1: https://lore.kernel.org/all/20250325-wip-obbardc-qcom-t14s-oled-panel-v2-4-e9bc7c9d30cc@linaro.org/ --- drivers/gpu/drm/display/drm_dp_helper.c | 42 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 15 deletions(-) --- base-commit: 4c4d9b7b6c6e676eca22585139aba5f03de74b90 change-id: 20250327-wip-obbardc-qcom-t14s-oled-panel-brightness-4020865b6580 Best regards, diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c index e2439c8a7fefe116b04aaa689b557e2387b05540..5550c40310c55ee275b3ebec08a7500cab38ae78 100644 --- a/drivers/gpu/drm/display/drm_dp_helper.c +++ b/drivers/gpu/drm/display/drm_dp_helper.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -4035,6 +4036,32 @@ drm_edp_backlight_probe_max(struct drm_dp_aux *aux, struct drm_edp_backlight_inf } pn &= DP_EDP_PWMGEN_BIT_COUNT_MASK; + + ret = drm_dp_dpcd_read_byte(aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &pn_min); + if (ret < 0) { + drm_dbg_kms(aux->drm_dev, "%s: Failed to read pwmgen bit count cap min: %d\n", + aux->name, ret); + return -ENODEV; + } + pn_min &= DP_EDP_PWMGEN_BIT_COUNT_MASK; + + ret = drm_dp_dpcd_read_byte(aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX, &pn_max); + if (ret < 0) { + drm_dbg_kms(aux->drm_dev, "%s: Failed to read pwmgen bit count cap max: %d\n", + aux->name, ret); + return -ENODEV; + } + pn_max &= DP_EDP_PWMGEN_BIT_COUNT_MASK; + + /* + * Per VESA eDP Spec v1.4b, section 3.3.10.2: + * If DP_EDP_PWMGEN_BIT_COUNT is less than DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, + * the sink must use the MIN value as the effective PWM bit count. + * Clamp the reported value to the [MIN, MAX] capability range to ensure + * correct brightness scaling on compliant eDP panels. + */ + pn = clamp(pn, pn_min, pn_max); + bl->max = (1 << pn) - 1; if (!driver_pwm_freq_hz) return 0; @@ -4061,21 +4088,6 @@ drm_edp_backlight_probe_max(struct drm_dp_aux *aux, struct drm_edp_backlight_inf * - FxP is within 25% of desired value. * Note: 25% is arbitrary value and may need some tweak. */ - ret = drm_dp_dpcd_read_byte(aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &pn_min); - if (ret < 0) { - drm_dbg_kms(aux->drm_dev, "%s: Failed to read pwmgen bit count cap min: %d\n", - aux->name, ret); - return 0; - } - ret = drm_dp_dpcd_read_byte(aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX, &pn_max); - if (ret < 0) { - drm_dbg_kms(aux->drm_dev, "%s: Failed to read pwmgen bit count cap max: %d\n", - aux->name, ret); - return 0; - } - pn_min &= DP_EDP_PWMGEN_BIT_COUNT_MASK; - pn_max &= DP_EDP_PWMGEN_BIT_COUNT_MASK; - /* Ensure frequency is within 25% of desired value */ fxp_min = DIV_ROUND_CLOSEST(fxp * 3, 4); fxp_max = DIV_ROUND_CLOSEST(fxp * 5, 4);