From nobody Fri Dec 19 20:13:17 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A083090EB for ; Thu, 4 Dec 2025 06:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764829039; cv=none; b=UinxCrtOo+vSq7MBz5Tyvb1PxtNtAQZC+0lMyHqHR0mYOql5IUum6JTHWmSo9ECpeMOm6W/hvltZ4ymMDwK7swdZhAIQfkmPBE8vXqkXX8Fjjzuf0Y3A+HmkdLkU8KQvX/my0rysBb2pPsh4sJhClnhKeBeCR+3xuY1vGW50AvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764829039; c=relaxed/simple; bh=7MhN37ZrjcndwEVK0UG8bIaOv/sX3fYUDn7Msl1T6HE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XCvZec/hsH/OYAcrWxQq4oBR0csRs2qR+Lq0Uhpf7PK6/75erpchVmvKyRXuQXp5YAr0Co0Y2N/QVqdUigDVJULCPAbd7HUGhkCi0xdp0ePzTjSGoxfYssDtSAvJopMnAbNX99rcq2raxFIFzHUZmqJJ1z0i2uU1+Hmc4HBMCAs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=O5K5VgTo; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O5K5VgTo" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b735e278fa1so97969666b.0 for ; Wed, 03 Dec 2025 22:17:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764829035; x=1765433835; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SrokhqA6GJ5qHaATPIZtdAEmnKVCv3ZhPjrr90tfwBE=; b=O5K5VgTo//FmbhHZ9llCWQXTaS5wNdslSmTjKUjMR3gzcR0mG5WofKSO4/lX6YFrmK h7//7Hxco6wqUfyR/eTn1KkYKN6elEL5BM6ezVJSlJiiUX7b50JmzwjzHCF2q7Y07fFG twRN8cEmJhDrGPTEYyDNGWuwCmoSwRTaGjkX7ZMerI/8e8ECjXEx7/xP3p4FGP+uCNm/ ZPStqUIDwq/r9oOD85YauDel4A56ck2Yq+UZsB5OohreKBB5uEcfaVqnpMKqhAp/H6tj mD1TwFMRocXDwddr/qDZDTLzF2/ju4ihs3K4bGYHhAt6QZedQPuqOjsGRsi88T5OhL6t UYOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764829035; x=1765433835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SrokhqA6GJ5qHaATPIZtdAEmnKVCv3ZhPjrr90tfwBE=; b=AIceoF/hr0U6cKWVXlRcK9n/NaHni1WqBU2czQ4KrII0AEoEkobbXn7X8h1vMFyWFi yQQ0kHOG10fxVGFsyd1II66P8TsHKu/5tbLoOq3jeAPnZ7GRFnQrb+LM7yaU+UiXlpGW kxYsoRrKattOxvNVs58ZDu5Hstei/3NlLUdxX3YB4Ix/u76Bb/hPtnGTV3M0IXlseDlL X8GBid4Ju15TilmICF/Ql8ce00xcfbTkQHpc9q1cVq24BBXGJdHpJjSEh78JLonfh/8c FA04uTd8NemzJLslLcOau9NZd2ko0nCneKE0rOp5eTaEUCt+WAnVDkIlswPs3Uzmsrnr Ct/Q== X-Forwarded-Encrypted: i=1; AJvYcCWrgdoxFtE1r6/lgfBSZnPTCnaNWwShF6N0M90XsXEmPHYJnPgVROLX7is6LPdacd35Mn4Vk5Efu5V3C5c=@vger.kernel.org X-Gm-Message-State: AOJu0YxvRjbRDPfzqwsysa+nuuP7EommATvArk5savKVhA5VMmztrKQx MhhXF34dmOfRBnAkIMXBFMr/gtrr+Pfjfl+JwqVMtqKm9xhqbypXFDvy X-Gm-Gg: ASbGncvTxW66rh7vwdhpqn7gV1KDPKXERcQ3HA63dClo9wfKYqyIMNfs5BZJG3i/Cca JDgYG+FEmw2D06grXeQShBSda/vgm2NGxWCIn+N9hbbm2HEb74hjV+eZ7Ukog6XO2qO2+rZZZsf /ruklyDXrhQ8cN8EpfeE5s6h/VDih6uzb3sWzjzMKOBZ1rbSOfCykG9CSC/NxeZfYcs/Baa0OSA GQmwjYkKIjv4TyxOdFaf43z+LvpWCagaCfW1MUaxkuo0BheeCWPFwv1Sbq/bM8dsLnJu2H5/gHv 3lSBiH0MrIbDoMLZCghVDRPVM9VOaQunQC2NFmyIHW0OPecfOjF0+PkQvzMP0oVI3A8LR3JWOWA jilUSbBXo4KiVP9CmoVciWAOOolhKql5H8U+26dg7mVKEQ5f5az51spFpPVv/rDcEnlAyynOTN7 sN8asvlfL6tw== X-Google-Smtp-Source: AGHT+IGGRcCBn7dDmnJ9YtWI4tOlSL4ai8HDBzVnkC7QNxtJAImhu/v/dhsGR+njm+E47PKBNIF3OQ== X-Received: by 2002:a17:906:794a:b0:b72:af1f:af7d with SMTP id a640c23a62f3a-b79ec674170mr204057766b.29.1764829035144; Wed, 03 Dec 2025 22:17:15 -0800 (PST) Received: from xeon ([188.163.112.74]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-647b2ec2d8csm490159a12.5.2025.12.03.22.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Dec 2025 22:17:14 -0800 (PST) From: Svyatoslav Ryhel To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Thierry Reding , Jonathan Hunter , Prashant Gaikwad , Michael Turquette , Stephen Boyd , Mikko Perttunen , David Airlie , Simona Vetter , Svyatoslav Ryhel , Dmitry Osipenko , Charan Pedumuru Cc: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/4 RESEND] gpu/drm: tegra: dsi: add support for Tegra20/Tegra30 Date: Thu, 4 Dec 2025 08:17:02 +0200 Message-ID: <20251204061703.5579-4-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251204061703.5579-1-clamor95@gmail.com> References: <20251204061703.5579-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Tegra20 and Tegra30 are fully compatible with existing tegra DSI driver apart from clock configuration and PAD calibration which are addressed by this patch. Signed-off-by: Svyatoslav Ryhel --- drivers/gpu/drm/tegra/drm.c | 2 + drivers/gpu/drm/tegra/dsi.c | 88 ++++++++++++++++++++++++------------- drivers/gpu/drm/tegra/dsi.h | 15 +++++++ 3 files changed, 74 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 4596073fe28f..5d64cd57e764 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1359,10 +1359,12 @@ static SIMPLE_DEV_PM_OPS(host1x_drm_pm_ops, host1x_= drm_suspend, =20 static const struct of_device_id host1x_drm_subdevs[] =3D { { .compatible =3D "nvidia,tegra20-dc", }, + { .compatible =3D "nvidia,tegra20-dsi", }, { .compatible =3D "nvidia,tegra20-hdmi", }, { .compatible =3D "nvidia,tegra20-gr2d", }, { .compatible =3D "nvidia,tegra20-gr3d", }, { .compatible =3D "nvidia,tegra30-dc", }, + { .compatible =3D "nvidia,tegra30-dsi", }, { .compatible =3D "nvidia,tegra30-hdmi", }, { .compatible =3D "nvidia,tegra30-gr2d", }, { .compatible =3D "nvidia,tegra30-gr3d", }, diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index 8e80c7efe8b4..d079aa7d2a85 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -53,6 +53,10 @@ to_dsi_state(struct drm_connector_state *state) return container_of(state, struct tegra_dsi_state, base); } =20 +struct tegra_dsi_config { + u32 dsi_version; +}; + struct tegra_dsi { struct host1x_client client; struct tegra_output output; @@ -82,6 +86,8 @@ struct tegra_dsi { /* for ganged-mode support */ struct tegra_dsi *master; struct tegra_dsi *slave; + + const struct tegra_dsi_config *config; }; =20 static inline struct tegra_dsi * @@ -663,39 +669,46 @@ static int tegra_dsi_pad_enable(struct tegra_dsi *dsi) { u32 value; =20 - value =3D DSI_PAD_CONTROL_VS1_PULLDN(0) | DSI_PAD_CONTROL_VS1_PDIO(0); - tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_0); + if (dsi->config->dsi_version =3D=3D TEGRA_DSI_V1) { + /* + * XXX Is this still needed? The module reset is deasserted right + * before this function is called. + */ + tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_0); + tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_1); + tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_2); + tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_3); + tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_4); + + value =3D DSI_PAD_CONTROL_VS1_PULLDN(0) | DSI_PAD_CONTROL_VS1_PDIO(0); + tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_0); + + value =3D DSI_PAD_SLEW_UP(0x7) | DSI_PAD_SLEW_DN(0x7) | + DSI_PAD_LP_UP(0x1) | DSI_PAD_LP_DN(0x1) | + DSI_PAD_OUT_CLK(0x0); + tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_2); + + value =3D DSI_PAD_PREEMP_PD_CLK(0x3) | DSI_PAD_PREEMP_PU_CLK(0x3) | + DSI_PAD_PREEMP_PD(0x03) | DSI_PAD_PREEMP_PU(0x3); + tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_3); + } else { + value =3D DSI_PAD_CONTROL_LPUPADJ(0x1) | DSI_PAD_CONTROL_LPDNADJ(0x1) | + DSI_PAD_CONTROL_PREEMP_EN(0x1) | DSI_PAD_CONTROL_SLEWDNADJ(0x6) | + DSI_PAD_CONTROL_SLEWUPADJ(0x6) | DSI_PAD_CONTROL_PDIO(0) | + DSI_PAD_CONTROL_PDIO_CLK(0) | DSI_PAD_CONTROL_PULLDN_ENAB(0); + tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_0); + } =20 return 0; } =20 static int tegra_dsi_pad_calibrate(struct tegra_dsi *dsi) { - u32 value; int err; =20 - /* - * XXX Is this still needed? The module reset is deasserted right - * before this function is called. - */ - tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_0); - tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_1); - tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_2); - tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_3); - tegra_dsi_writel(dsi, 0, DSI_PAD_CONTROL_4); - /* start calibration */ tegra_dsi_pad_enable(dsi); =20 - value =3D DSI_PAD_SLEW_UP(0x7) | DSI_PAD_SLEW_DN(0x7) | - DSI_PAD_LP_UP(0x1) | DSI_PAD_LP_DN(0x1) | - DSI_PAD_OUT_CLK(0x0); - tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_2); - - value =3D DSI_PAD_PREEMP_PD_CLK(0x3) | DSI_PAD_PREEMP_PU_CLK(0x3) | - DSI_PAD_PREEMP_PD(0x03) | DSI_PAD_PREEMP_PU(0x3); - tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_3); - err =3D tegra_mipi_start_calibration(dsi->mipi); if (err < 0) return err; @@ -1577,6 +1590,7 @@ static int tegra_dsi_probe(struct platform_device *pd= ev) if (!dsi) return -ENOMEM; =20 + dsi->config =3D of_device_get_match_data(&pdev->dev); dsi->output.dev =3D dsi->dev =3D &pdev->dev; dsi->video_fifo_depth =3D 1920; dsi->host_fifo_depth =3D 64; @@ -1615,7 +1629,7 @@ static int tegra_dsi_probe(struct platform_device *pd= ev) goto remove; } =20 - dsi->clk_lp =3D devm_clk_get(&pdev->dev, "lp"); + dsi->clk_lp =3D devm_clk_get_optional(&pdev->dev, "lp"); if (IS_ERR(dsi->clk_lp)) { err =3D dev_err_probe(&pdev->dev, PTR_ERR(dsi->clk_lp), "cannot get low-power clock\n"); @@ -1636,10 +1650,12 @@ static int tegra_dsi_probe(struct platform_device *= pdev) goto remove; } =20 - err =3D tegra_dsi_setup_clocks(dsi); - if (err < 0) { - dev_err(&pdev->dev, "cannot setup clocks\n"); - goto remove; + if (dsi->config->dsi_version =3D=3D TEGRA_DSI_V1) { + err =3D tegra_dsi_setup_clocks(dsi); + if (err < 0) { + dev_err(&pdev->dev, "cannot setup clocks\n"); + goto remove; + } } =20 dsi->regs =3D devm_platform_ioremap_resource(pdev, 0); @@ -1703,11 +1719,21 @@ static void tegra_dsi_remove(struct platform_device= *pdev) tegra_mipi_free(dsi->mipi); } =20 +static const struct tegra_dsi_config tegra20_dsi_config =3D { + .dsi_version =3D TEGRA_DSI_V0, +}; + +static const struct tegra_dsi_config tegra114_dsi_config =3D { + .dsi_version =3D TEGRA_DSI_V1, +}; + static const struct of_device_id tegra_dsi_of_match[] =3D { - { .compatible =3D "nvidia,tegra210-dsi", }, - { .compatible =3D "nvidia,tegra132-dsi", }, - { .compatible =3D "nvidia,tegra124-dsi", }, - { .compatible =3D "nvidia,tegra114-dsi", }, + { .compatible =3D "nvidia,tegra210-dsi", .data =3D &tegra114_dsi_config }, + { .compatible =3D "nvidia,tegra132-dsi", .data =3D &tegra114_dsi_config }, + { .compatible =3D "nvidia,tegra124-dsi", .data =3D &tegra114_dsi_config }, + { .compatible =3D "nvidia,tegra114-dsi", .data =3D &tegra114_dsi_config }, + { .compatible =3D "nvidia,tegra30-dsi", .data =3D &tegra20_dsi_config }, + { .compatible =3D "nvidia,tegra20-dsi", .data =3D &tegra20_dsi_config }, { }, }; MODULE_DEVICE_TABLE(of, tegra_dsi_of_match); diff --git a/drivers/gpu/drm/tegra/dsi.h b/drivers/gpu/drm/tegra/dsi.h index f39594e65e97..5049ec7813c7 100644 --- a/drivers/gpu/drm/tegra/dsi.h +++ b/drivers/gpu/drm/tegra/dsi.h @@ -95,6 +95,16 @@ #define DSI_TALLY_LRX(x) (((x) & 0xff) << 8) #define DSI_TALLY_HTX(x) (((x) & 0xff) << 0) #define DSI_PAD_CONTROL_0 0x4b +/* DSI V0 */ +#define DSI_PAD_CONTROL_PULLDN_ENAB(x) (((x) & 0x1) << 28) +#define DSI_PAD_CONTROL_SLEWUPADJ(x) (((x) & 0x7) << 24) +#define DSI_PAD_CONTROL_SLEWDNADJ(x) (((x) & 0x7) << 20) +#define DSI_PAD_CONTROL_PREEMP_EN(x) (((x) & 0x1) << 19) +#define DSI_PAD_CONTROL_PDIO_CLK(x) (((x) & 0x1) << 18) +#define DSI_PAD_CONTROL_PDIO(x) (((x) & 0x3) << 16) +#define DSI_PAD_CONTROL_LPUPADJ(x) (((x) & 0x3) << 14) +#define DSI_PAD_CONTROL_LPDNADJ(x) (((x) & 0x3) << 12) +/* DSI V1 */ #define DSI_PAD_CONTROL_VS1_PDIO(x) (((x) & 0xf) << 0) #define DSI_PAD_CONTROL_VS1_PDIO_CLK (1 << 8) #define DSI_PAD_CONTROL_VS1_PULLDN(x) (((x) & 0xf) << 16) @@ -140,4 +150,9 @@ enum tegra_dsi_format { TEGRA_DSI_FORMAT_24P, }; =20 +enum tegra_dsi_version { + TEGRA_DSI_V0, + TEGRA_DSI_V1, +}; + #endif --=20 2.48.1