From patchwork Tue Mar 1 15:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Branchereau X-Patchwork-Id: 12764852 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 D8979C433F5 for ; Tue, 1 Mar 2022 15:31:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21A6910E591; Tue, 1 Mar 2022 15:31:49 +0000 (UTC) Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5190710E591 for ; Tue, 1 Mar 2022 15:31:47 +0000 (UTC) Received: by mail-wr1-x42f.google.com with SMTP id j17so21184677wrc.0 for ; Tue, 01 Mar 2022 07:31:47 -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=Y3t0gFOybWi0MCei9ZUc6VbMi31QOTaeoMi0EEuB9EGC8sXZVldqOJmDzlxTlRAKhr sHJAuqEiWaDoxD8VxLmmZj9TBDOQlMYzaZ2hkOB3rx+KPUygSYGFzYt0RPHK8bBjlXMy tXJZxdv8M4GQzCp4EX8K17PD+n6qyDiWQawvs3wLUtkPHy25dQSjBLhYjsqPF7/DgVPr N0gkSCJTvnYALhOOcAIECIXyB39CT3+kUoyVs95Y6salojTsWXvJcptr2hOpA5Lbx+Ps hlHN3GXJq06VPtv8B3Y767p8ClFl6VftI6aMw8vzYPD4HVlpmMkJdl2L7dKBogLTrsSS Jj9w== 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=B2ow57qfK4E0fRgq/+mclYZyhGPwQChI2OMynNrGHZqtXXDe5+ojQh73XYhgd5yF/W RE9uA+wzTasamBAL3esA73u7F3AmAUrbKDKx8pPF5Pnbp++C2GSo+V983QjnBiv8eY+i w932FmcejXDobKEyojtbg01FyQnTpKfDn4gMnxXYLawQqRSHxooRzKCBiLi2eG1xtf6b k65z8bM7Y/Y3bLrvLfOUclUQgXUaZDwR1sT96DcC5Xg9Jhcgm8Un4sq+MLoJAhySCSlY aZYA3OuP2cGALsavk5HApyDRPqJeN3T71zQ9xf7PNCn2x8rR67RwQe+93QnFz5kU9rdL F+3Q== X-Gm-Message-State: AOAM5321qrlepW/I/oUSt+IVoaCJ3CUkZ4JdU+tixJpjl52zkAMYsOx6 owLhwFhj0IicXHW+4D4IAk8= X-Google-Smtp-Source: ABdhPJzIkkJjFN+Ll7MM/KbLuKabD6lSAVrRlRI0D/yR4BBSZY9LHIvA4txOSvNmXtoPjUKKd4ipDg== X-Received: by 2002:adf:e6c7:0:b0:1ed:9f7c:c99e with SMTP id y7-20020adfe6c7000000b001ed9f7cc99emr19458323wrm.0.1646148705791; Tue, 01 Mar 2022 07:31:45 -0800 (PST) Received: from monk.home ([2a01:cb10:430:ec00:4737:d56e:186b:af1]) by smtp.gmail.com with ESMTPSA id b13-20020a05600c4e0d00b003816cb4892csm5797377wmq.0.2022.03.01.07.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Mar 2022 07:31:45 -0800 (PST) From: Christophe Branchereau To: Paul Cercueil , David Airlie , Daniel Vetter , Thierry Reding , Sam Ravnborg Subject: [PATCH v1 1/3] drm/ingenic : add ingenic_drm_bridge_atomic_enable Date: Tue, 1 Mar 2022 16:31:20 +0100 Message-Id: <20220301153122.20660-2-cbranchereau@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301153122.20660-1-cbranchereau@gmail.com> References: <20220301153122.20660-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: 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,