From patchwork Tue Mar 8 13:06:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Branchereau X-Patchwork-Id: 12773773 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 AF9C9C433EF for ; Tue, 8 Mar 2022 13:06:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DEEE710E6D5; Tue, 8 Mar 2022 13:06:57 +0000 (UTC) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by gabe.freedesktop.org (Postfix) with ESMTPS id BBB1110E6D5 for ; Tue, 8 Mar 2022 13:06:56 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id i8so28425372wrr.8 for ; Tue, 08 Mar 2022 05:06:56 -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=kABsl8nFckhHhGe72PdD4LYbj+x9bM4gFy/8W5Qq+ys=; b=CeNbbGSqvyasiw3aKrSWBu+ByZiMzoj0xOyu80rURPjmzSMameTQ41nAx19Gr6BGiR rvKB/ErAp7bOr0L8qDoNIYLdOEAUvQYU12U8QGY6McoiVecBP+DzZa+EojmmHKqfFfaF d570wz2HMUlTB6yeNWfcoM1b3TwXxa5eEphl++JfoJN7aUPEW3OIeG0yJmV/w+gSBthD msrX+vxehJVzaksBhyXTJcNdefwZzeGDEmoyRcJtaNiXOajJpX7bZKpn/+OMF6rPTOpD 28Dj0H0G9MuiLhBVAylZLydjWTQ941HvZ9fNALjvr7IbBKx3Jz/pkIxYmaNVXRtncmSi onoQ== 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=kABsl8nFckhHhGe72PdD4LYbj+x9bM4gFy/8W5Qq+ys=; b=PtIZNLiDVVn9KAMn4Z0KLaPzKGMGmG3WyKfIsqLG/oyNzlprid8Q7Hfvt366j6UYEJ VP3FeRiLGUDfo3tLQe1iTHjcXvjMtL5ntBTZF2PrJfjyRWwie2RSPDKLa4iezSbvo+SA Dx7tXjC10D/UHhGgyFdwK7PMhpaI2f0CNxiZyYQ9xzKtUhgQIoKbA9OaeRXKR2yKanii suhR6dsi7Ds+eyegP8yBNo/Z2pQW2sf4OOPUfO19YtrpmAwegXQVjD4KsDgIaYMXSyrl ZmfKhI/LxJTVWpfsbNfaWrHIjejD6tJuprYVSnac85kXW5SpPta6+VLyVvaVNgxYYAPU 63Dg== X-Gm-Message-State: AOAM533O/i/4hYtpf59ccSHxQlwP31Rbqw6ZXaaxbA1ND9ybBcpxNxbJ HP1wGoVnNf9bQuhDm5ZP8Es= X-Google-Smtp-Source: ABdhPJyQTsNDK4VxbuzBVRU4ohQD6eHLp6t1D2aSuYrQhwZeUjA0ogkAH1NuopdvNJL7wd5OE6WbLw== X-Received: by 2002:a5d:5850:0:b0:1f0:2d5b:dc35 with SMTP id i16-20020a5d5850000000b001f02d5bdc35mr12095290wrf.344.1646744815193; Tue, 08 Mar 2022 05:06:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 05:06:54 -0800 (PST) From: Christophe Branchereau To: Paul Cercueil , David Airlie , Daniel Vetter , Thierry Reding , Sam Ravnborg , Rob Herring Subject: [PATCH v2 1/4] drm/ingenic : add ingenic_drm_bridge_atomic_enable Date: Tue, 8 Mar 2022 14:06:40 +0100 Message-Id: <20220308130643.260683-2-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" This allows the CRTC to be enabled after panels have slept out, and before their display is turned on, solving a graphical bug on the newvision nv3502c Signed-off-by: Christophe Branchereau --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index dcf44cb00821..51512f41263e 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -226,6 +226,18 @@ static int ingenic_drm_update_pixclk(struct notifier_block *nb, } } +static void ingenic_drm_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) +{ + struct ingenic_drm *priv = drm_device_get_priv(bridge->dev); + + regmap_write(priv->map, JZ_REG_LCD_STATE, 0); + + regmap_update_bits(priv->map, JZ_REG_LCD_CTRL, + JZ_LCD_CTRL_ENABLE | JZ_LCD_CTRL_DISABLE, + JZ_LCD_CTRL_ENABLE); +} + static void ingenic_drm_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) { @@ -237,17 +249,11 @@ static void ingenic_drm_crtc_atomic_enable(struct drm_crtc *crtc, if (WARN_ON(IS_ERR(priv_state))) return; - regmap_write(priv->map, JZ_REG_LCD_STATE, 0); - /* Set addresses of our DMA descriptor chains */ next_id = priv_state->use_palette ? HWDESC_PALETTE : 0; regmap_write(priv->map, JZ_REG_LCD_DA0, dma_hwdesc_addr(priv, next_id)); regmap_write(priv->map, JZ_REG_LCD_DA1, dma_hwdesc_addr(priv, 1)); - regmap_update_bits(priv->map, JZ_REG_LCD_CTRL, - JZ_LCD_CTRL_ENABLE | JZ_LCD_CTRL_DISABLE, - JZ_LCD_CTRL_ENABLE); - drm_crtc_vblank_on(crtc); } @@ -968,6 +974,7 @@ static const struct drm_encoder_helper_funcs ingenic_drm_encoder_helper_funcs = static const struct drm_bridge_funcs ingenic_drm_bridge_funcs = { .attach = ingenic_drm_bridge_attach, + .atomic_enable = ingenic_drm_bridge_atomic_enable, .atomic_check = ingenic_drm_bridge_atomic_check, .atomic_reset = drm_atomic_helper_bridge_reset, .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,