From patchwork Thu Mar 20 16:00:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14024118 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 E661AC35FFF for ; Thu, 20 Mar 2025 16:00:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 85EF010E661; Thu, 20 Mar 2025 16:00:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="eTkGfef9"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9219810E660 for ; Thu, 20 Mar 2025 16:00:46 +0000 (UTC) Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 158091AF6; Thu, 20 Mar 2025 16:59:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742486342; bh=NRiwCTHabbz+p81RY4GkrUeFRgzVyalNNk+RjRNcX5o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eTkGfef9c4eLyHnGTF57/9I38Tmd/aF81JpzOp7HKJ8/VG3HDfHDYwW3os64W3Xpy mfXOMniZoprYsVQH1Uo/+JM6KZtXiAQajY2eXKTsqaIwoNuXJwMYPb2prG6pYyy1UC i76idGffrPitu9uxhFQL9wg6KXjPXScOCPiC4sK0= From: Tomi Valkeinen Date: Thu, 20 Mar 2025 18:00:08 +0200 Subject: [PATCH 13/18] drm/bridge: cdns-dsi: Do not use crtc_* values MIME-Version: 1.0 Message-Id: <20250320-cdns-dsi-impro-v1-13-725277c5f43b@ideasonboard.com> References: <20250320-cdns-dsi-impro-v1-0-725277c5f43b@ideasonboard.com> In-Reply-To: <20250320-cdns-dsi-impro-v1-0-725277c5f43b@ideasonboard.com> To: Jyri Sarha , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Vinod Koul , Kishon Vijay Abraham I , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, Francesco Dolcini , Aradhya Bhatia , Devarsh Thakkar , Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3185; i=tomi.valkeinen@ideasonboard.com; h=from:subject:message-id; bh=NRiwCTHabbz+p81RY4GkrUeFRgzVyalNNk+RjRNcX5o=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn3DuaJBl/Bj3bIpsidbOdy0WDF+M2ekIW2h00H CV/5EUW1vCJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ9w7mgAKCRD6PaqMvJYe 9WE1EACQbmVEp0iXWdv/F75eMgjtyPJQC74XIzB+5fNwrjOIyV/bxvzwg4UwrTkQeVhaGkhfxz7 O/Tt42jR/dfCNX4AMeIsF/YeWmxn2mNWk5oDslMLZBKVzjab2acg4Lz0DVq14xsruij9Ytrg2sE 3HWtInuu9ZpGPANhHQG4VJlF6ghkvWgZ6WPnWfH3b7YEU+s9vR0l1FmhzD0AgzWu2vXmMqG6P/F zTOTH8QnB0DZmdGbnkZdMQNEsmqcmnsaGrdUMO3vQzmEpVkeIlicClDcm0fagjEmaEfoDbrvTO8 OyWO0u+hsT4wiQGlBOYb5Rxaes9yUTvaI/ug+wFAMCV3P3du4/cB3c+0b73R/isokqs41mO94wW zsO8s87VsiaCrqpdODfMFj/imWgH2Gns3a9WNvBfnc1eRJbbelzXZhqDxYPTa8RoXabI4iScqTH 3nnn/ajLN5ZAy7sKk0BnPxWrmaX3p7sGw3WiUIAQ6V8e7fUtfooP2I8HO/p78rxO47wjkI+nCnr oNpV44QDFoDIH8Gk3G5rWFH9N6LkNng5r2402ePIgAIgUncxntg4JbJgR/w5vHpTQ+H0pQ3Oms4 zXegaAStHwEVpSz4PIxp2PX3pR7QzbZBRbhVC8eroqWQdp4jkKVNZt/hVQvrCU2QYLTP4cgrv6/ z0/rszyd/2WyZSw== X-Developer-Key: i=tomi.valkeinen@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The driver uses crtc_* fields from the mode. While I think in the enable-path this would be correct, I do not think it's correct in the check phase, as the crtc hasn't had a chance to update the crtc_* fields yet. Overall, my understanding is that the crtc_* fields are relevant only in cases where we have things like interlace or double pixel mode, where we have a logical and real timings. We never use those with DSI, so the crtc_* fields should just always match the normal values. So, drop the use of crtc_* values. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c index cf783680b1b4..220213f5cb09 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -476,10 +476,10 @@ static int cdns_dsi_mode2cfg(struct cdns_dsi *dsi, bool sync_pulse; int bpp; - dpi_hsa = mode->crtc_hsync_end - mode->crtc_hsync_start; - dpi_hbp = mode->crtc_htotal - mode->crtc_hsync_end; - dpi_hfp = mode->crtc_hsync_start - mode->crtc_hdisplay; - dpi_hact = mode->crtc_hdisplay; + dpi_hsa = mode->hsync_end - mode->hsync_start; + dpi_hbp = mode->htotal - mode->hsync_end; + dpi_hfp = mode->hsync_start - mode->hdisplay; + dpi_hact = mode->hdisplay; memset(dsi_cfg, 0, sizeof(*dsi_cfg)); @@ -540,11 +540,11 @@ static int cdns_dsi_adjust_phy_config(struct cdns_dsi *dsi, if (dsi_htotal % lanes) adj_dsi_htotal += lanes - (dsi_htotal % lanes); - dpi_hz = mode->crtc_clock * 1000; + dpi_hz = mode->clock * 1000; dlane_bps = (unsigned long long)dpi_hz * adj_dsi_htotal; /* data rate in bytes/sec is not an integer, refuse the mode. */ - dpi_htotal = mode->crtc_htotal; + dpi_htotal = mode->htotal; if (do_div(dlane_bps, lanes * dpi_htotal)) return -EINVAL; @@ -572,7 +572,7 @@ static int cdns_dsi_check_conf(struct cdns_dsi *dsi, if (ret) return ret; - ret = phy_mipi_dphy_get_default_config(mode->crtc_clock * 1000, + ret = phy_mipi_dphy_get_default_config(mode->clock * 1000, mipi_dsi_pixel_format_to_bpp(output->dev->format), nlanes, phy_cfg); if (ret) @@ -822,11 +822,11 @@ static void cdns_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge, writel(HFP_LEN(dsi_cfg.hfp) | HACT_LEN(dsi_cfg.hact), dsi->regs + VID_HSIZE2); - writel(VBP_LEN(mode->crtc_vtotal - mode->crtc_vsync_end - 1) | - VFP_LEN(mode->crtc_vsync_start - mode->crtc_vdisplay) | - VSA_LEN(mode->crtc_vsync_end - mode->crtc_vsync_start + 1), + writel(VBP_LEN(mode->vtotal - mode->vsync_end - 1) | + VFP_LEN(mode->vsync_start - mode->vdisplay) | + VSA_LEN(mode->vsync_end - mode->vsync_start + 1), dsi->regs + VID_VSIZE1); - writel(mode->crtc_vdisplay, dsi->regs + VID_VSIZE2); + writel(mode->vdisplay, dsi->regs + VID_VSIZE2); tmp = dsi_cfg.htotal - (dsi_cfg.hsa + DSI_BLANKING_FRAME_OVERHEAD +