From patchwork Fri Mar 11 12:04:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Branchereau X-Patchwork-Id: 12777912 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 EF367C433FE for ; Fri, 11 Mar 2022 12:05:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0C5110E92D; Fri, 11 Mar 2022 12:05:06 +0000 (UTC) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by gabe.freedesktop.org (Postfix) with ESMTPS id A49A810E266 for ; Fri, 11 Mar 2022 12:05:02 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id e24so12586444wrc.10 for ; Fri, 11 Mar 2022 04:05:02 -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=KiSvK38EPX6IVw+/gJKjYTTFER6OlFDYV3XuPizh+2g=; b=GNguAO2uWN1UiBD/ylQEmPI0linSOxq65vNJ4T2z3R5+fEmDZoq6hXxq70BBAXOM8d 9jHO/T0ps948vFcdHFwXQL5ege3egCE7kVaTo9Y3rRNLS55+ZswYsvDqQgNTsFhY+zlR J7dzD4VhW1JLdfVthqo12kC/QkGBS/6rkX+8JAQQKp2Q6xwEMRaGEDPViyU0qg1DBGQr 1L4ePKpzsWp/k+vNGnU6N0bEyQkySAD//GnAygLwOLliPYE7PcZ2z6Khq7lWJ4KekLkc g3HfhTwMFTUyiAWrtNOnu/xy1csw7jY1kl4pOf32phhkudVRhcUy14IFrDsvEM23yIW9 TDPQ== 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=KiSvK38EPX6IVw+/gJKjYTTFER6OlFDYV3XuPizh+2g=; b=hfe06V5RmQZO67cwYlZ3sHw7AUK9gnaV9XS9xm6PDWhjEdzYUJb/geUqF3kmxxw6um qgG+zfmNqKHkO3pF493WcTbGWtg0ZoGxDhEZJ/wiUI9kBrhOz5FFz0F38WWw2eyAttKR e9y+2ho4zYNotpArwgGqYWRJ1VxTGVmqNCF/r9VxdSrSDIm0aHyANUVJfNfButU+5YXf OXSJnPVkXaBK6Z/nTAjAlb/gIrlVAFmwUsTrA7JMjlXqC3AnOMNn5/efaFLeoVU1hdwh AHDHvNrQU2BczB8NqXunuh6afXRiuioSY68oVWnGhf2uFG+0UAmTu207IzXqzodhCDGU qI/Q== X-Gm-Message-State: AOAM5302tcoWa4/zUuS1lxF9H98zfZeL1jyxSgnBrhPOUdA2ZZMRynvS zTT2qUjHO14xqHQZwpzPYDo= X-Google-Smtp-Source: ABdhPJwbUy9EJ8y4TPRZVO6VLPrG+JBb0cYYUa3n3u+USWarkc+Gm0UpIRbkOjkNqhToCzHXPkWIrg== X-Received: by 2002:adf:8bd4:0:b0:1ed:c1f8:3473 with SMTP id w20-20020adf8bd4000000b001edc1f83473mr7474689wra.435.1647000301055; Fri, 11 Mar 2022 04:05:01 -0800 (PST) Received: from monk.home ([2a01:cb10:430:ec00:4737:d56e:186b:af1]) by smtp.gmail.com with ESMTPSA id r20-20020adfa154000000b001f0326a23e1sm6595223wrr.88.2022.03.11.04.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 04:05:00 -0800 (PST) From: Christophe Branchereau To: Paul Cercueil , David Airlie , Daniel Vetter , Thierry Reding , Sam Ravnborg , Rob Herring Subject: [PATCH v3 1/4] drm/ingenic : add ingenic_drm_bridge_atomic_enable Date: Fri, 11 Mar 2022 13:04:50 +0100 Message-Id: <20220311120453.163297-2-cbranchereau@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220311120453.163297-1-cbranchereau@gmail.com> References: <20220311120453.163297-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,