Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp201976rwb; Tue, 25 Jul 2023 14:26:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlFNKNDChXhbeAY8Q6DLPp2J+Eatr3XyIc5PjQVbaPJRBgSRd98MrDHKdsvYNA/n5jKY1Ok8 X-Received: by 2002:a17:903:247:b0:1bb:8cb6:3f99 with SMTP id j7-20020a170903024700b001bb8cb63f99mr348888plh.14.1690320388675; Tue, 25 Jul 2023 14:26:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690320388; cv=none; d=google.com; s=arc-20160816; b=AAkCOavUFauS8fHTUYHyfrNItk1ry6CAeF3kTl0IXZouMTptIy4iR64LoDa7Rz7H1I nsAF5JYHYkmLC+KffGJdkK//yJyANONP+udsfv0bdL03hK7tuLqzApuxWBT7hxJRDdDa bcVBMbx/5FbliNLldQ4Eg9n41A7lN4jcQ3157Nuic6kj1jZ8xRntPZxF+MeE2BtfeYU7 hKaNnP67V3s+LOnyDejOfvmSH+T8r8fH2s6vVMMxbI61L31q3PISZFuz5RyM1cFpwz1N H/CDUm6G8IQ1e8DiowkiMChOIxIEEbXPzP9iLxNPtuzH4anerlNJZrdJSDUDIRaLRBeR fWxg== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id im23-20020a170902bb1700b001bb7b0a67cfsi8512152plb.31.2023.07.25.14.26.16; Tue, 25 Jul 2023 14:26: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 S231231AbjGYUhH (ORCPT + 99 others); Tue, 25 Jul 2023 16:37:07 -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 ); 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 ; Tue, 25 Jul 2023 13:37:00 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-563c7aabf38so187187a12.0 for ; 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 To: Jiri Kosina , Benjamin Tissoires , Bjorn Andersson , Konrad Dybcio , Rob Herring , Frank Rowand , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: cros-qcom-dts-watchers@chromium.org, Chris Morgan , 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 , devicetree@vger.kernel.org, Daniel Vetter , yangcong5@huaqin.corp-partner.google.com, Douglas Anderson 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: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Douglas Anderson --- 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(-) 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, -- 2.41.0.487.g6d72f3e995-goog