From patchwork Tue Mar 8 13:06:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Branchereau X-Patchwork-Id: 12773775 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 D19C4C433EF for ; Tue, 8 Mar 2022 13:07:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 857F810E6F6; Tue, 8 Mar 2022 13:07:02 +0000 (UTC) Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16C1510E6F0 for ; Tue, 8 Mar 2022 13:07:00 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id p9so28432075wra.12 for ; Tue, 08 Mar 2022 05:07:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CDRCVh5+XHKQRRsWU/rtw+qyV3P2V1tvxwx8uNiM2Wo=; b=Ky4TTzhOPngv49aT29V3Wwzh8Gxpvbyud2eTLHJxWa3yJrv963ei4srJhgtR1xD3aQ vADvj8+hWIZ2UgiupW1q7/lyPlr+AfzVWa02FUkiFiq/SpeKOIbU909QYao9nRXMwoWl g+e4648qYPBk05do9LYcaNmNm0bxbsoQqQWnnyDFfKz8NLe0DowfLveHPJaQ6G/LZlde yp7TOB8kBoQFYL1Bbuuy5fCtf8t7VvebX6G4UPtwkcOqVOs67Pl7+vqPMby7M62HQh3y Y4da6WpWKn2aLKF6VhQFGM52QO1TYYLj1r9S+eT0LzdpUPDZLDpIa0yEwpbhzAkivDh/ 9exQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CDRCVh5+XHKQRRsWU/rtw+qyV3P2V1tvxwx8uNiM2Wo=; b=a7mGk9OyLCin4QJcfcx0SwV1oeB/X4Aw31D6XRffD0kK2CLsyfSmnoO9A3mkSVO0u9 RnHEcD0aE+blcWC24DqtVyojjkTE9zhJGee5h9gAciRgtT2n/Wlle7P3wkYGBDitcCUf qo6LzamTkLy1/nCzjHelAwxQCbdBWsuDwyskxTFKNkOJzrzlquRC37ler2w8jSuozLXk r2PrWezviH7UnB7cXbbdLldTmpdWqZfmIPZ/uiRIUavz3tYxysRvXOLz9cAgv6x5bMXf sq/HLuSHyXU8RSabfGE0njgafTEveXPGQMKltP/DdKuAWaL+iZ/jPQgDvylkhgSdyp/9 9hrw== X-Gm-Message-State: AOAM533NJNeM1Xdi2QIo0ZIMqgRG3Fn3cv6fz+q51URcLRmGUIEdZORw 8kvbvOAKzDQdnyzKjUkPhmI= X-Google-Smtp-Source: ABdhPJw9ctP/0Y0MryDoGfe6G+0lgBK3RxXcgbm7ksoJh1Dk30TNepsME/lbIh14ITPs/Wgq9oN6XA== X-Received: by 2002:adf:e6d0:0:b0:1f1:dfaa:ac39 with SMTP id y16-20020adfe6d0000000b001f1dfaaac39mr11765891wrm.239.1646744818605; Tue, 08 Mar 2022 05:06:58 -0800 (PST) Received: from monk.home ([2a01:cb10:430:ec00:4737:d56e:186b:af1]) by smtp.gmail.com with ESMTPSA id p15-20020a05600c1d8f00b003899d50f01csm2129159wms.6.2022.03.08.05.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 05:06:58 -0800 (PST) From: Christophe Branchereau To: Paul Cercueil , David Airlie , Daniel Vetter , Thierry Reding , Sam Ravnborg , Rob Herring Subject: [PATCH v2 3/4] drm/panel : innolux-ej030na and abt-y030xx067a : add .enable and .disable Date: Tue, 8 Mar 2022 14:06:42 +0100 Message-Id: <20220308130643.260683-4-cbranchereau@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220308130643.260683-1-cbranchereau@gmail.com> References: <20220308130643.260683-1-cbranchereau@gmail.com> MIME-Version: 1.0 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: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Following the introduction of bridge_atomic_enable in the ingenic drm driver, the crtc is enabled between .prepare and .enable, if it exists. Add it so the backlight is only enabled after the crtc is, to avoid graphical issues. Signed-off-by: Christophe Branchereau --- drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 23 ++++++++++++-- drivers/gpu/drm/panel/panel-innolux-ej030na.c | 31 ++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c index f043b484055b..b5736344e3ec 100644 --- a/drivers/gpu/drm/panel/panel-abt-y030xx067a.c +++ b/drivers/gpu/drm/panel/panel-abt-y030xx067a.c @@ -183,8 +183,6 @@ static int y030xx067a_prepare(struct drm_panel *panel) goto err_disable_regulator; } - msleep(120); - return 0; err_disable_regulator: @@ -202,6 +200,25 @@ static int y030xx067a_unprepare(struct drm_panel *panel) return 0; } +static int y030xx067a_enable(struct drm_panel *panel) +{ + if (panel->backlight) { + /* Wait for the picture to be ready before enabling backlight */ + msleep(120); + } + + return 0; +} + +static int y030xx067a_disable(struct drm_panel *panel) +{ + struct y030xx067a *priv = to_y030xx067a(panel); + + regmap_clear_bits(priv->map, 0x06, REG06_XPSAVE); + + return 0; +} + static int y030xx067a_get_modes(struct drm_panel *panel, struct drm_connector *connector) { @@ -239,6 +256,8 @@ static int y030xx067a_get_modes(struct drm_panel *panel, static const struct drm_panel_funcs y030xx067a_funcs = { .prepare = y030xx067a_prepare, .unprepare = y030xx067a_unprepare, + .enable = y030xx067a_enable, + .disable = y030xx067a_disable, .get_modes = y030xx067a_get_modes, }; diff --git a/drivers/gpu/drm/panel/panel-innolux-ej030na.c b/drivers/gpu/drm/panel/panel-innolux-ej030na.c index c558de3f99be..6de7370185cd 100644 --- a/drivers/gpu/drm/panel/panel-innolux-ej030na.c +++ b/drivers/gpu/drm/panel/panel-innolux-ej030na.c @@ -80,8 +80,6 @@ static const struct reg_sequence ej030na_init_sequence[] = { { 0x47, 0x08 }, { 0x48, 0x0f }, { 0x49, 0x0f }, - - { 0x2b, 0x01 }, }; static int ej030na_prepare(struct drm_panel *panel) @@ -109,8 +107,6 @@ static int ej030na_prepare(struct drm_panel *panel) goto err_disable_regulator; } - msleep(120); - return 0; err_disable_regulator: @@ -128,6 +124,31 @@ static int ej030na_unprepare(struct drm_panel *panel) return 0; } +static int ej030na_enable(struct drm_panel *panel) +{ + struct ej030na *priv = to_ej030na(panel); + + /* standby off */ + regmap_write(priv->map, 0x2b, 0x01); + + if (panel->backlight) { + /* Wait for the picture to be ready before enabling backlight */ + msleep(120); + } + + return 0; +} + +static int ej030na_disable(struct drm_panel *panel) +{ + struct ej030na *priv = to_ej030na(panel); + + /* standby on */ + regmap_write(priv->map, 0x2b, 0x00); + + return 0; +} + static int ej030na_get_modes(struct drm_panel *panel, struct drm_connector *connector) { @@ -165,6 +186,8 @@ static int ej030na_get_modes(struct drm_panel *panel, static const struct drm_panel_funcs ej030na_funcs = { .prepare = ej030na_prepare, .unprepare = ej030na_unprepare, + .enable = ej030na_enable, + .disable = ej030na_disable, .get_modes = ej030na_get_modes, };