Message ID | 20230725133443.v3.2.I59b417d4c29151cc2eff053369ec4822b606f375@changeid |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp4204vqo; Tue, 25 Jul 2023 13:51:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQJ0aK24+Qr0OPQR3EVUG30Ovp4JePgQXiWyEXUDjkZ58HdEbixPIY2uyx41aoYXuYthat X-Received: by 2002:a17:906:64c8:b0:993:f081:2c5a with SMTP id p8-20020a17090664c800b00993f0812c5amr3200ejn.5.1690318288836; Tue, 25 Jul 2023 13:51:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690318288; cv=none; d=google.com; s=arc-20160816; b=aucKogFdF349JV7TjhnYVXmeXzTDCZA8a/OICjxJdOM38+ijzwcpqL8cAWYZ2goMnp 2SMzEoaNWkIcCP1hi14EmgQRGbKNXiJuzJa09rTCHgwV29S5hEhz/1ljJjzqTUKnDDXc EkHQYlNSgci6yRGZJb/akXxg00lsPAXXw/s2pCQk1BvZH7AqLKPcKnusWhCpc9CB7ADp akg8ccTRoEmtyzhi2KAS8j5Penx1ebpbm6/lq6+RP//Gtvd7dyr8S31bzR85x2tPWGry pXxAcw7Neno86WSubScNk8xlTRQdiC5x6qNq4Y5Lrj24McWPCnyOcOpNKJwLEAWhP/je /trg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iP077J8EmgyqkeILX2Yz7pVClwWU9gA5lNNcugVIOYM=; fh=l9Sxp0WjWxoPPBlRLV6ri41IHQAwx7j1EblxKJXOsZc=; b=ywZPB3xgPWD6AX5k+8POlyYhYqlY2kzaIMGrhSJG3PpaE9e9bKWRTBfFcOqBegfzYf 0tU98U5WgrDijaWzCMEuYy6JT6MDrC34yMwOwpzHGSSt40Eh94ADoE0ACRFAVT49iYtC zmKiOFVCFe8a4aG4AYrJBcN2tkGUjZdQRAs91TsoyPybYZoFHA3ULKgHfZptD4ccHKlX eM6pQlXWgqwG2cYvUY1lKgGmi5CAcd3fq7emLYM1cT2/2047R+XN4LT8dr2IlUdWzNCO kpECd4Tvr2o5doZJ/vdP7cy4JAoHQXOMz9TGvHHd5WY9/kWaO+lBWmIAxkqZfosjDpq4 nGig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GZtIAhgp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p21-20020a1709060dd500b0098d2f716c75si8011733eji.597.2023.07.25.13.51.04; Tue, 25 Jul 2023 13:51:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=GZtIAhgp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231159AbjGYUhI (ORCPT <rfc822;kautuk.consul.80@gmail.com> + 99 others); Tue, 25 Jul 2023 16:37:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230500AbjGYUhB (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 25 Jul 2023 16:37:01 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F85610F7 for <linux-kernel@vger.kernel.org>; Tue, 25 Jul 2023 13:37:00 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-563c7aabf38so187187a12.0 for <linux-kernel@vger.kernel.org>; Tue, 25 Jul 2023 13:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1690317419; x=1690922219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iP077J8EmgyqkeILX2Yz7pVClwWU9gA5lNNcugVIOYM=; b=GZtIAhgpfRM6/PPCpYhDawEQ6STVkqSIEtcARCGIslDV0E2Oz5EubU2sXZt7Y5WysZ nKHRRDgxz+IHkbiAD+r0tr3hYj9QMJNtPXWKWcYKUibKzK1RlYALHKuldQpyQ+rjq2tC vqm+0xJeEEXyQUwsjDBcku/nb5WAuu2nfu6Mw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690317419; x=1690922219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iP077J8EmgyqkeILX2Yz7pVClwWU9gA5lNNcugVIOYM=; b=X+d4cBZzlhzn651uzeqiyzzLa98K/pQU9V8OyfTmOZ8tgGgTAzBWNMw67ag2y4W5zP 2niJ+f71uATipKMG8sEJHHcVTc0DO2i1QyaviioznIkQM06Pb7Lr03Kh9DRZqKpwc5+Y 1z72WChGM7aZj7x1aWjCSjkmCK9OPB81xh2Th4TtRqU25kcNUDguMykIEhqscOqA4z4q 6fnth3mk6kdSewV6dJwyw8YNR+8BpqKG2NHAIWpcVcKYHcNpHz4PZyNsj3G8ASdoGGU/ 2R2k4ndoXjcYgupR2mfAKdTAdJ1Pd2zqNaMUruHEkg0Zo6Ert8ae0NvT+2yh29rU5rcB bsbA== X-Gm-Message-State: ABy/qLYmr4ot0Q9CtgClUlzDLsjBznbSYpCo6xCl+OWC07NePVwREjTX 66jpCMXaGBvPYp9U6B0nIAnFpQ== X-Received: by 2002:a17:90a:4a8e:b0:268:e3d:1251 with SMTP id f14-20020a17090a4a8e00b002680e3d1251mr269480pjh.20.1690317419541; Tue, 25 Jul 2023 13:36:59 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:c363:4681:f5b8:301]) by smtp.gmail.com with ESMTPSA id bg1-20020a17090b0d8100b002676e961261sm1396951pjb.1.2023.07.25.13.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 13:36:58 -0700 (PDT) From: Douglas Anderson <dianders@chromium.org> To: Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Neil Armstrong <neil.armstrong@linaro.org>, Sam Ravnborg <sam@ravnborg.org>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de> Cc: cros-qcom-dts-watchers@chromium.org, Chris Morgan <macroalpha82@gmail.com>, linux-input@vger.kernel.org, hsinyi@google.com, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Torokhov <dmitry.torokhov@gmail.com>, devicetree@vger.kernel.org, Daniel Vetter <daniel@ffwll.ch>, yangcong5@huaqin.corp-partner.google.com, Douglas Anderson <dianders@chromium.org> Subject: [PATCH v3 02/10] drm/panel: Check for already prepared/enabled in drm_panel Date: Tue, 25 Jul 2023 13:34:37 -0700 Message-ID: <20230725133443.v3.2.I59b417d4c29151cc2eff053369ec4822b606f375@changeid> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog In-Reply-To: <20230725203545.2260506-1-dianders@chromium.org> References: <20230725203545.2260506-1-dianders@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772427189794567059 X-GMAIL-MSGID: 1772427189794567059 |
Series |
drm/panel and i2c-hid: Allow panels and touchscreens to power sequence together
|
|
Commit Message
Doug Anderson
July 25, 2023, 8:34 p.m. UTC
In a whole pile of panel drivers, we have code to make the prepare/unprepare/enable/disable callbacks behave as no-ops if they've already been called. It's silly to have this code duplicated everywhere. Add it to the core instead so that we can eventually delete it from all the drivers. Note: to get some idea of the duplicated code, try: git grep 'if.*>prepared' -- drivers/gpu/drm/panel git grep 'if.*>enabled' -- drivers/gpu/drm/panel NOTE: arguably, the right thing to do here is actually to skip this patch and simply remove all the extra checks from the individual drivers. Perhaps the checks were needed at some point in time in the past but maybe they no longer are? Certainly as we continue transitioning over to "panel_bridge" then we expect there to be much less variety in how these calls are made. When we're called as part of the bridge chain, things should be pretty simple. In fact, there was some discussion in the past about these checks [1], including a discussion about whether the checks were needed and whether the calls ought to be refcounted. At the time, I decided not to mess with it because it felt too risky. Looking closer at it now, I'm fairly certain that nothing in the existing codebase is expecting these calls to be refcounted. The only real question is whether someone is already doing something to ensure prepare()/unprepare() match and enabled()/disable() match. I would say that, even if there is something else ensuring that things match, there's enough complexity that adding an extra bool and an extra double-check here is a good idea. Let's add a drm_warn() to let people know that it's considered a minor error to take advantage of drm_panel's double-checking but we'll still make things work fine. [1] https://lore.kernel.org/r/20210416153909.v4.27.I502f2a92ddd36c3d28d014dd75e170c2d405a0a5@changeid Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- This has Neil's Ack and I could commit it to drm-misc-next, but for now I'm holding off to see where this series ends up. If the series ends up looking good we'll have to coordinate landing the various bits between the drm and the hid trees and the second drm patch in my series depends on this one. If my series implodes I'll land this one on its own. In any case, once this lands somewhere I'll take an AI to cleanup the panels. (no changes since v1) drivers/gpu/drm/drm_panel.c | 49 ++++++++++++++++++++++++++++++++----- include/drm/drm_panel.h | 14 +++++++++++ 2 files changed, 57 insertions(+), 6 deletions(-)
Comments
Hi, On Tue, Jul 25, 2023 at 01:34:37PM -0700, Douglas Anderson wrote: > NOTE: arguably, the right thing to do here is actually to skip this > patch and simply remove all the extra checks from the individual > drivers. Perhaps the checks were needed at some point in time in the > past but maybe they no longer are? Certainly as we continue > transitioning over to "panel_bridge" then we expect there to be much > less variety in how these calls are made. When we're called as part of > the bridge chain, things should be pretty simple. In fact, there was > some discussion in the past about these checks [1], including a > discussion about whether the checks were needed and whether the calls > ought to be refcounted. At the time, I decided not to mess with it > because it felt too risky. Yeah, I'd agree here too. I've never found evidence that it was actually needed and it really looks like cargo cult to me. And if it was needed, then I'm not sure we need refcounting either. We don't have refcounting for atomic_enable / disable, we have a sound API design that makes sure we don't fall into that trap :) > Looking closer at it now, I'm fairly certain that nothing in the > existing codebase is expecting these calls to be refcounted. The only > real question is whether someone is already doing something to ensure > prepare()/unprepare() match and enabled()/disable() match. I would say > that, even if there is something else ensuring that things match, > there's enough complexity that adding an extra bool and an extra > double-check here is a good idea. Let's add a drm_warn() to let people > know that it's considered a minor error to take advantage of > drm_panel's double-checking but we'll still make things work fine. I'm ok with this, if we follow-up in a couple of releases and remove it and all the calls. Could you add a TODO item so that we can keep a track of it? A follow-up is fine if you don't send a new version of that series. Maxime
Hi, On Wed, Jul 26, 2023 at 5:41 AM Maxime Ripard <mripard@kernel.org> wrote: > > Hi, > > On Tue, Jul 25, 2023 at 01:34:37PM -0700, Douglas Anderson wrote: > > NOTE: arguably, the right thing to do here is actually to skip this > > patch and simply remove all the extra checks from the individual > > drivers. Perhaps the checks were needed at some point in time in the > > past but maybe they no longer are? Certainly as we continue > > transitioning over to "panel_bridge" then we expect there to be much > > less variety in how these calls are made. When we're called as part of > > the bridge chain, things should be pretty simple. In fact, there was > > some discussion in the past about these checks [1], including a > > discussion about whether the checks were needed and whether the calls > > ought to be refcounted. At the time, I decided not to mess with it > > because it felt too risky. > > Yeah, I'd agree here too. I've never found evidence that it was actually > needed and it really looks like cargo cult to me. > > And if it was needed, then I'm not sure we need refcounting either. We > don't have refcounting for atomic_enable / disable, we have a sound API > design that makes sure we don't fall into that trap :) > > > Looking closer at it now, I'm fairly certain that nothing in the > > existing codebase is expecting these calls to be refcounted. The only > > real question is whether someone is already doing something to ensure > > prepare()/unprepare() match and enabled()/disable() match. I would say > > that, even if there is something else ensuring that things match, > > there's enough complexity that adding an extra bool and an extra > > double-check here is a good idea. Let's add a drm_warn() to let people > > know that it's considered a minor error to take advantage of > > drm_panel's double-checking but we'll still make things work fine. > > I'm ok with this, if we follow-up in a couple of releases and remove it > and all the calls. > > Could you add a TODO item so that we can keep a track of it? A follow-up > is fine if you don't send a new version of that series. By this, I think you mean to add a "TODO" comment inline in the code? Also: I was thinking that we'd keep the check in "drm_panel.c" with the warning message indefinitely. You think it should be eventually removed? If we are truly thinking of removing it eventually, this feels like it should be a more serious warning message like a WARN(1, ...) to make it really obvious to people that they're relying on behavior that will eventually go away. -Doug
Hi, On Wed, Jul 26, 2023 at 08:10:33AM -0700, Doug Anderson wrote: > On Wed, Jul 26, 2023 at 5:41 AM Maxime Ripard <mripard@kernel.org> wrote: > > On Tue, Jul 25, 2023 at 01:34:37PM -0700, Douglas Anderson wrote: > > > NOTE: arguably, the right thing to do here is actually to skip this > > > patch and simply remove all the extra checks from the individual > > > drivers. Perhaps the checks were needed at some point in time in the > > > past but maybe they no longer are? Certainly as we continue > > > transitioning over to "panel_bridge" then we expect there to be much > > > less variety in how these calls are made. When we're called as part of > > > the bridge chain, things should be pretty simple. In fact, there was > > > some discussion in the past about these checks [1], including a > > > discussion about whether the checks were needed and whether the calls > > > ought to be refcounted. At the time, I decided not to mess with it > > > because it felt too risky. > > > > Yeah, I'd agree here too. I've never found evidence that it was actually > > needed and it really looks like cargo cult to me. > > > > And if it was needed, then I'm not sure we need refcounting either. We > > don't have refcounting for atomic_enable / disable, we have a sound API > > design that makes sure we don't fall into that trap :) > > > > > Looking closer at it now, I'm fairly certain that nothing in the > > > existing codebase is expecting these calls to be refcounted. The only > > > real question is whether someone is already doing something to ensure > > > prepare()/unprepare() match and enabled()/disable() match. I would say > > > that, even if there is something else ensuring that things match, > > > there's enough complexity that adding an extra bool and an extra > > > double-check here is a good idea. Let's add a drm_warn() to let people > > > know that it's considered a minor error to take advantage of > > > drm_panel's double-checking but we'll still make things work fine. > > > > I'm ok with this, if we follow-up in a couple of releases and remove it > > and all the calls. > > > > Could you add a TODO item so that we can keep a track of it? A follow-up > > is fine if you don't send a new version of that series. > > By this, I think you mean to add a "TODO" comment inline in the code? No, sorry, I meant an entry in our TODO list: Documentation/gpu/todo.rst > Also: I was thinking that we'd keep the check in "drm_panel.c" with > the warning message indefinitely. You think it should be eventually > removed? If we are truly thinking of removing it eventually, this > feels like it should be a more serious warning message like a WARN(1, > ...) to make it really obvious to people that they're relying on > behavior that will eventually go away. Yeah, it really feels like this is cargo-cult to me. Your approach seems like a good short-term thing to do to warn everyone but eventually we'll want it to go away. So promoting it to a WARN could be a good thing, or let's say we do a drm_warn for now, WARN next release, and gone in two? Maxime
In my case a few different panel drivers disable the regulators in the unprepare/disable routines. For at least the Rockchip DSI implementations for some reason the panel gets unprepared more than once, which triggers an unbalanced regulator disable. Obviously though the correct course of action is to fix the reason why the panel is disabled more than once, but that's at least the root cause of this behavior on the few panels I've worked with. Thank you. On Thu, Jul 27, 2023 at 1:38 AM Maxime Ripard <mripard@kernel.org> wrote: > > Hi, > > On Wed, Jul 26, 2023 at 08:10:33AM -0700, Doug Anderson wrote: > > On Wed, Jul 26, 2023 at 5:41 AM Maxime Ripard <mripard@kernel.org> wrote: > > > On Tue, Jul 25, 2023 at 01:34:37PM -0700, Douglas Anderson wrote: > > > > NOTE: arguably, the right thing to do here is actually to skip this > > > > patch and simply remove all the extra checks from the individual > > > > drivers. Perhaps the checks were needed at some point in time in the > > > > past but maybe they no longer are? Certainly as we continue > > > > transitioning over to "panel_bridge" then we expect there to be much > > > > less variety in how these calls are made. When we're called as part of > > > > the bridge chain, things should be pretty simple. In fact, there was > > > > some discussion in the past about these checks [1], including a > > > > discussion about whether the checks were needed and whether the calls > > > > ought to be refcounted. At the time, I decided not to mess with it > > > > because it felt too risky. > > > > > > Yeah, I'd agree here too. I've never found evidence that it was actually > > > needed and it really looks like cargo cult to me. > > > > > > And if it was needed, then I'm not sure we need refcounting either. We > > > don't have refcounting for atomic_enable / disable, we have a sound API > > > design that makes sure we don't fall into that trap :) > > > > > > > Looking closer at it now, I'm fairly certain that nothing in the > > > > existing codebase is expecting these calls to be refcounted. The only > > > > real question is whether someone is already doing something to ensure > > > > prepare()/unprepare() match and enabled()/disable() match. I would say > > > > that, even if there is something else ensuring that things match, > > > > there's enough complexity that adding an extra bool and an extra > > > > double-check here is a good idea. Let's add a drm_warn() to let people > > > > know that it's considered a minor error to take advantage of > > > > drm_panel's double-checking but we'll still make things work fine. > > > > > > I'm ok with this, if we follow-up in a couple of releases and remove it > > > and all the calls. > > > > > > Could you add a TODO item so that we can keep a track of it? A follow-up > > > is fine if you don't send a new version of that series. > > > > By this, I think you mean to add a "TODO" comment inline in the code? > > No, sorry, I meant an entry in our TODO list: Documentation/gpu/todo.rst > > > Also: I was thinking that we'd keep the check in "drm_panel.c" with > > the warning message indefinitely. You think it should be eventually > > removed? If we are truly thinking of removing it eventually, this > > feels like it should be a more serious warning message like a WARN(1, > > ...) to make it really obvious to people that they're relying on > > behavior that will eventually go away. > > Yeah, it really feels like this is cargo-cult to me. Your approach seems > like a good short-term thing to do to warn everyone but eventually we'll > want it to go away. > > So promoting it to a WARN could be a good thing, or let's say we do a > drm_warn for now, WARN next release, and gone in two? > > Maxime
Hi, On Mon, Jul 31, 2023 at 11:33:22AM -0500, Chris Morgan wrote: > In my case a few different panel drivers disable the regulators in the > unprepare/disable routines. And that's totally fine. > For at least the Rockchip DSI implementations for some reason the > panel gets unprepared more than once, which triggers an unbalanced > regulator disable. "For some reason" being that DW-DSI apparently finds it ok to bypass any kind of abstraction and randomly calling panel functions by itself: https://elixir.bootlin.com/linux/v6.4.7/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L868 It looks like it's fixed it current drm-misc-next though. > Obviously though the correct course of action is to fix the reason why > the panel is disabled more than once, but that's at least the root > cause of this behavior on the few panels I've worked with. Like I said we already have a commit on the way to fix that, so it shouldn't be an issue anymore. I stand by what I was saying earlier though, I think it's mostly cargo-cult or drivers being very wrong. If anything, the DW-DSI stuff made me even more convinced that we shouldn't even entertain that idea :) Maxime
On Mon, Jul 31, 2023 at 07:03:07PM +0200, Maxime Ripard wrote: > Hi, > > On Mon, Jul 31, 2023 at 11:33:22AM -0500, Chris Morgan wrote: > > In my case a few different panel drivers disable the regulators in the > > unprepare/disable routines. > > And that's totally fine. > > > For at least the Rockchip DSI implementations for some reason the > > panel gets unprepared more than once, which triggers an unbalanced > > regulator disable. > > "For some reason" being that DW-DSI apparently finds it ok to bypass any > kind of abstraction and randomly calling panel functions by itself: > > https://elixir.bootlin.com/linux/v6.4.7/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L868 > > It looks like it's fixed it current drm-misc-next though. Good, when I get a chance I will test it out with the existing panels I have at my disposal and submit some patches to clean them up. > > > Obviously though the correct course of action is to fix the reason why > > the panel is disabled more than once, but that's at least the root > > cause of this behavior on the few panels I've worked with. > > Like I said we already have a commit on the way to fix that, so it > shouldn't be an issue anymore. > > I stand by what I was saying earlier though, I think it's mostly > cargo-cult or drivers being very wrong. If anything, the DW-DSI stuff > made me even more convinced that we shouldn't even entertain that idea > :) > > Maxime Thank you, and yes if a driver is doing something it shouldn't we shouldn't be patching around that, we should be fixing things. Thanks for providing me with the additional info. Chris
On Wed, 2 Aug 2023 at 18:26, Chris Morgan <macroalpha82@gmail.com> wrote: > > * Spam * > On Mon, Jul 31, 2023 at 07:03:07PM +0200, Maxime Ripard wrote: > > Hi, > > > > On Mon, Jul 31, 2023 at 11:33:22AM -0500, Chris Morgan wrote: > > > In my case a few different panel drivers disable the regulators in the > > > unprepare/disable routines. > > > > And that's totally fine. > > > > > For at least the Rockchip DSI implementations for some reason the > > > panel gets unprepared more than once, which triggers an unbalanced > > > regulator disable. > > > > "For some reason" being that DW-DSI apparently finds it ok to bypass any > > kind of abstraction and randomly calling panel functions by itself: > > > > https://elixir.bootlin.com/linux/v6.4.7/source/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c#L868 > > > > It looks like it's fixed it current drm-misc-next though. > > Good, when I get a chance I will test it out with the existing panels > I have at my disposal and submit some patches to clean them up. > > > > > > Obviously though the correct course of action is to fix the reason why > > > the panel is disabled more than once, but that's at least the root > > > cause of this behavior on the few panels I've worked with. > > > > Like I said we already have a commit on the way to fix that, so it > > shouldn't be an issue anymore. > > > > I stand by what I was saying earlier though, I think it's mostly > > cargo-cult or drivers being very wrong. If anything, the DW-DSI stuff > > made me even more convinced that we shouldn't even entertain that idea > > :) DW-DSI is hacking around the fact that DSI panels may want to send DCS commands in unprepare, however the DSI host driver shuts down the controller in the DSI bridge post_disable which gets called first. That ordering can now be reversed with pre_enable_prev_first flag in struct drm_bridge, or prepare_prev_first in drm_panel, hence no need for the DSI controller to jump around the bridge chain. Dave > > Maxime > > Thank you, and yes if a driver is doing something it shouldn't we > shouldn't be patching around that, we should be fixing things. Thanks > for providing me with the additional info. > > Chris >
diff --git a/drivers/gpu/drm/drm_panel.c b/drivers/gpu/drm/drm_panel.c index f634371c717a..4e1c4e42575b 100644 --- a/drivers/gpu/drm/drm_panel.c +++ b/drivers/gpu/drm/drm_panel.c @@ -105,11 +105,22 @@ EXPORT_SYMBOL(drm_panel_remove); */ int drm_panel_prepare(struct drm_panel *panel) { + int ret; + if (!panel) return -EINVAL; - if (panel->funcs && panel->funcs->prepare) - return panel->funcs->prepare(panel); + if (panel->prepared) { + dev_warn(panel->dev, "Skipping prepare of already prepared panel\n"); + return 0; + } + + if (panel->funcs && panel->funcs->prepare) { + ret = panel->funcs->prepare(panel); + if (ret < 0) + return ret; + } + panel->prepared = true; return 0; } @@ -128,11 +139,22 @@ EXPORT_SYMBOL(drm_panel_prepare); */ int drm_panel_unprepare(struct drm_panel *panel) { + int ret; + if (!panel) return -EINVAL; - if (panel->funcs && panel->funcs->unprepare) - return panel->funcs->unprepare(panel); + if (!panel->prepared) { + dev_warn(panel->dev, "Skipping unprepare of already unprepared panel\n"); + return 0; + } + + if (panel->funcs && panel->funcs->unprepare) { + ret = panel->funcs->unprepare(panel); + if (ret < 0) + return ret; + } + panel->prepared = false; return 0; } @@ -155,11 +177,17 @@ int drm_panel_enable(struct drm_panel *panel) if (!panel) return -EINVAL; + if (panel->enabled) { + dev_warn(panel->dev, "Skipping enable of already enabled panel\n"); + return 0; + } + if (panel->funcs && panel->funcs->enable) { ret = panel->funcs->enable(panel); if (ret < 0) return ret; } + panel->enabled = true; ret = backlight_enable(panel->backlight); if (ret < 0) @@ -187,13 +215,22 @@ int drm_panel_disable(struct drm_panel *panel) if (!panel) return -EINVAL; + if (!panel->enabled) { + dev_warn(panel->dev, "Skipping disable of already disabled panel\n"); + return 0; + } + ret = backlight_disable(panel->backlight); if (ret < 0) DRM_DEV_INFO(panel->dev, "failed to disable backlight: %d\n", ret); - if (panel->funcs && panel->funcs->disable) - return panel->funcs->disable(panel); + if (panel->funcs && panel->funcs->disable) { + ret = panel->funcs->disable(panel); + if (ret < 0) + return ret; + } + panel->enabled = false; return 0; } diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 432fab2347eb..c6cf75909389 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -198,6 +198,20 @@ struct drm_panel { * the panel is powered up. */ bool prepare_prev_first; + + /** + * @prepared: + * + * If true then the panel has been prepared. + */ + bool prepared; + + /** + * @enabled: + * + * If true then the panel has been enabled. + */ + bool enabled; }; void drm_panel_init(struct drm_panel *panel, struct device *dev,