From patchwork Mon Sep 13 13:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509759 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp604741jao; Mon, 13 Sep 2021 07:21:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqqJpHA6imAlHh2wMcV4u4xHO3URdjvkcx0RPbhext+cAPwISXNkECooJd1bZ1D6wPbNuR X-Received: by 2002:a17:907:175d:: with SMTP id lf29mr8351786ejc.163.1631542883518; Mon, 13 Sep 2021 07:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631542883; cv=none; d=google.com; s=arc-20160816; b=z04UI++WVMivnpXUIHtepzgoid+S7mW3eBMTG31d/5pSaVVTBPe2XEoSAE/dA7wt0e INvZkNeIpNufo5ZS/JuJDv/qk7gQVczrQQmZQIGvPy0VE1fC+5EYA65IdziMahcxex0d tMXlHAuqK/nbEAichs2Y8s1Fgwv/T1AD5j0bFvY3eBp2L+k2swH2En+APKoM+fWfvu0a 7HwtzdpfSCRDkOkDElOi0yPhUw5YtBLChMFNeZNyCTVr+y6o8yWgg8jPvWA534gs11KE yekvQ5WNNAoq2JZsAIlpVpJz+oqiSjAM6vkiW9YGC/GdofWLat+G6xN5h+Fa9oubNsH/ YbOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wKTmmrPf8vF5HWwPjcHtJfsO6Ru5p2T0HfZ3ljPu3MI=; b=pGCdlDdpTabUTA0eop3E1v9C6UH1cC9DJtYhuYAehRNLXQRexEwGTWJy9PBaMh5Tp/ OJJkIS550QTFpx5+VcFJUg98wLiim1YFqgXBB+grBzOWsPRq8CB2uar6GJqcNmbpZzgb Emoxh0OcsJ68o/mss/UBPOE3AtDdSTRQJvI9tq77GjWm5PQ2yLMTjS4OBVXygsFsYfgB 9Kyc40Z8z/qmwHtD9m85X8XAjWcWle6YDUWDpfwbl7UXxE5mtaF2QCvGLv7SuVkO+V5x fwPj1MR+8PTAR3RhZ9cC+PSzyYc3FJ+cdVSARwCvw8/0T4zCzKZyR14ybrnrt1nYMAIO 1Haw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MD/4KJGO"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r23si5957910edq.233.2021.09.13.07.21.22; Mon, 13 Sep 2021 07:21:23 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="MD/4KJGO"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344481AbhIMOVb (ORCPT + 11 others); Mon, 13 Sep 2021 10:21:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:39406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343715AbhIMOSg (ORCPT ); Mon, 13 Sep 2021 10:18:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AE84B61B26; Mon, 13 Sep 2021 13:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540721; bh=JNf/9+xP0HLhnRH6wzU6ye3hiIIAmzSJW71uHTqUR0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MD/4KJGOVnKvrzUFfSKt0JDWD2jAVyDqFaHVcNcHzr+HAkvu6fF9DsLKHqHzvx3Xx +hjFYi3QLrkR3i6cQm6ZtlOWot99ohjcBo/wVJwe/Mg9gIjJowyHcPUBupUGuDBBtv M/jD44RPRcCc4jGXtRnB0MmKtB/1S25iSAoP+F9A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marek Vasut , Daniel Thompson , Lee Jones Subject: [PATCH 5.13 299/300] backlight: pwm_bl: Improve bootloader/kernel device handover Date: Mon, 13 Sep 2021 15:16:00 +0200 Message-Id: <20210913131119.464872733@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniel Thompson commit 79fad92f2e596f5a8dd085788a24f540263ef887 upstream. Currently there are (at least) two problems in the way pwm_bl starts managing the enable_gpio pin. Both occur when the backlight is initially off and the driver finds the pin not already in output mode and, as a result, unconditionally switches it to output-mode and asserts the signal. Problem 1: This could cause the backlight to flicker since, at this stage in driver initialisation, we have no idea what the PWM and regulator are doing (an unconfigured PWM could easily "rest" at 100% duty cycle). Problem 2: This will cause us not to correctly honour the post_pwm_on_delay (which also risks flickers). Fix this by moving the code to configure the GPIO output mode until after we have examines the handover state. That allows us to initialize enable_gpio to off if the backlight is currently off and on if the backlight is on. Cc: stable@vger.kernel.org Reported-by: Marek Vasut Signed-off-by: Daniel Thompson Acked-by: Marek Vasut Tested-by: Marek Vasut Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/video/backlight/pwm_bl.c | 54 ++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 26 deletions(-) --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -409,6 +409,33 @@ static bool pwm_backlight_is_linear(stru static int pwm_backlight_initial_power_state(const struct pwm_bl_data *pb) { struct device_node *node = pb->dev->of_node; + bool active = true; + + /* + * If the enable GPIO is present, observable (either as input + * or output) and off then the backlight is not currently active. + * */ + if (pb->enable_gpio && gpiod_get_value_cansleep(pb->enable_gpio) == 0) + active = false; + + if (!regulator_is_enabled(pb->power_supply)) + active = false; + + if (!pwm_is_enabled(pb->pwm)) + active = false; + + /* + * Synchronize the enable_gpio with the observed state of the + * hardware. + */ + if (pb->enable_gpio) + gpiod_direction_output(pb->enable_gpio, active); + + /* + * Do not change pb->enabled here! pb->enabled essentially + * tells us if we own one of the regulator's use counts and + * right now we do not. + */ /* Not booted with device tree or no phandle link to the node */ if (!node || !node->phandle) @@ -420,20 +447,7 @@ static int pwm_backlight_initial_power_s * assume that another driver will enable the backlight at the * appropriate time. Therefore, if it is disabled, keep it so. */ - - /* if the enable GPIO is disabled, do not enable the backlight */ - if (pb->enable_gpio && gpiod_get_value_cansleep(pb->enable_gpio) == 0) - return FB_BLANK_POWERDOWN; - - /* The regulator is disabled, do not enable the backlight */ - if (!regulator_is_enabled(pb->power_supply)) - return FB_BLANK_POWERDOWN; - - /* The PWM is disabled, keep it like this */ - if (!pwm_is_enabled(pb->pwm)) - return FB_BLANK_POWERDOWN; - - return FB_BLANK_UNBLANK; + return active ? FB_BLANK_UNBLANK: FB_BLANK_POWERDOWN; } static int pwm_backlight_probe(struct platform_device *pdev) @@ -486,18 +500,6 @@ static int pwm_backlight_probe(struct pl goto err_alloc; } - /* - * If the GPIO is not known to be already configured as output, that - * is, if gpiod_get_direction returns either 1 or -EINVAL, change the - * direction to output and set the GPIO as active. - * Do not force the GPIO to active when it was already output as it - * could cause backlight flickering or we would enable the backlight too - * early. Leave the decision of the initial backlight state for later. - */ - if (pb->enable_gpio && - gpiod_get_direction(pb->enable_gpio) != 0) - gpiod_direction_output(pb->enable_gpio, 1); - pb->power_supply = devm_regulator_get(&pdev->dev, "power"); if (IS_ERR(pb->power_supply)) { ret = PTR_ERR(pb->power_supply);