From patchwork Fri Feb 14 15:08:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 865118 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 8CD5E267386 for ; Fri, 14 Feb 2025 15:09:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739545754; cv=none; b=nRPaLSnhFP5hFre8k3ziK44n6OSiEzMB5nLPTGSY7MfTVC94yTXe/wE1f9LjZJEpNSECx/bNpwksJeSbTPpgysBrHl8xWe0tjyjE7+Uo6hQy/VxqlEPEIiPZ+xangeBU8/t7siK9dsKs9DThb7Fib5a70/6c/OpHFFlDSCUhPtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739545754; c=relaxed/simple; bh=BQ4ctpKzt2JNBBm/FezOIGSkr/SYl7Hi5IRx7EgvobQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Aku/mDqwwHNIyXmZsLMYg9B1CLXiliNX3Ha/UjpTBBf8Hgqb5Xy2TsDCd+Lc/VczIKcUX1VZ+l/FyOxFrYDVq40iF3Eu4ybtGyq/j5uc5MphXWAkXiol0m1UuKdPCsDS2F9Uw0RSyC2HRxD/pLu95XLpSGVTikXBgz4isaB3s4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=YJWazoGX; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YJWazoGX" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-ab7b35a004aso38630066b.0 for ; Fri, 14 Feb 2025 07:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739545750; x=1740150550; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0GstLIXqd1K/ZKQfJCz4c26uEua+iUU1422NpxaHZF0=; b=YJWazoGXTuT0dc7Ch1owdLLCts7/Gd0oMXsV7rKdZyy4osFXPNJI+8NXrY5pKE8URZ x7oC8ppswz6GEsTVYc/ebflLd7U56oeYWLILM0scdgYqmJPEm5iJnt4cHuIdiV0j8TDw c5VL3iKGOIit5EzQnP/+n+p4dD5BaYssWUeTSAiotT32AozwXO5ACIhJLVdYShJr506m SRunYlGlgSYJc/zoyMEUNm+jNCL3DsikSB3PVcH/HjT4jPF/+XHny1yQ+sV3F4ednv/6 8Lp4+dAmSvRM7yfC4nbLzST1Q0wuYB9/eh9rkrcoz6a0WzphA3O6s7KA/362taq0Yfm3 JSlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739545750; x=1740150550; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0GstLIXqd1K/ZKQfJCz4c26uEua+iUU1422NpxaHZF0=; b=L03FkojfMMBbJxTnSb4XFQRql2YnjdjeoJ0qXLyLjc3kr/qSUuYLFUglIlpUeVnSg3 2FHtJ5clmOK0F7b8NgYcKSd4Im5QWkJ99Sj/j1VQ9z6xD65jq7zFKSu/S7Z9Yp4Yovnj 8mSZoW8zzfqc/HOzMmuVc2D1KCkbc20SKrLuDbMQd/yQkdQhBvi0Ljr2cqmlU7dQpSi9 Zkj1FD8h+HUNxpz3Yo/3o5i08eRUoHAm3b0+EigXL3IRGkZsipN0krBWYB7ALD2HbfKq G2Fy8ZBzB+4yRmnp5yRi0PoQxz7aNWdgss+Z1EYZJi7z+WBecwUX6JAtKrzh12h3Cppn GTtA== X-Gm-Message-State: AOJu0YyVOjszYitlyM3c/iRdDtzYj1jtKOwMBa2k+guw1mj7w6kLJ1XM dDm2qdEoMQVLJPwWJ6cskOIBwVhFJXUcxoUY3DyJJtDUKYosgKbN3jm9OXEH1jZ1bdxgSXB/hKE a X-Gm-Gg: ASbGncvja9bgV3ERjC2Lg40KlN3RShQoPhSsGbQo21mgf52P56HARmXess4sNpSalqj UORFwgyYYtKVvH5sAEH75JBc8f00ieI3/FdSuTxX22HbQh15ZdBQ40F+LsZT5rXIlCFYEVh/Xca ymv9CRJQNjyw9J4IecVYid1Wmn4eMmAYJG7V59yjrXr6eokCJn/nGnifUf8sll0W0NMGiGvKsgy 8NhP3WCxGs9GiUECKpZ8J8yrk0Mpu6jQccs99UGGfWCCbIxatNnHFDy92jfgbG/Zp72F55F486j pea4fTBY2afTKasnlmX8wOEQHIMej7M= X-Google-Smtp-Source: AGHT+IEzVqM+iUmxc7skwIAEYucZ3akEM3g7G8GQlo3NC2U8yusEjhbXvucjr1pSP1U70ccqH5eCWg== X-Received: by 2002:a17:907:9720:b0:ab7:be81:893b with SMTP id a640c23a62f3a-ab7f318e3f8mr491212166b.0.1739545750041; Fri, 14 Feb 2025 07:09:10 -0800 (PST) Received: from [127.0.1.1] ([178.197.218.144]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba533bf70asm356266766b.180.2025.02.14.07.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 07:09:09 -0800 (PST) From: Krzysztof Kozlowski Date: Fri, 14 Feb 2025 16:08:43 +0100 Subject: [PATCH v3 3/4] drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250214-drm-msm-phy-pll-cfg-reg-v3-3-0943b850722c@linaro.org> References: <20250214-drm-msm-phy-pll-cfg-reg-v3-0-0943b850722c@linaro.org> In-Reply-To: <20250214-drm-msm-phy-pll-cfg-reg-v3-0-0943b850722c@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jonathan Marek Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2592; i=krzysztof.kozlowski@linaro.org; h=from:subject:message-id; bh=BQ4ctpKzt2JNBBm/FezOIGSkr/SYl7Hi5IRx7EgvobQ=; b=owEBbQKS/ZANAwAKAcE3ZuaGi4PXAcsmYgBnr1yMWlXDCCR0YeuZkcFoQUPFixkLcf1UZ+u1H 9ehMouSx6iJAjMEAAEKAB0WIQTd0mIoPREbIztuuKjBN2bmhouD1wUCZ69cjAAKCRDBN2bmhouD 1yxpD/9hIXb1N3TiLm97hyItMPG7g63u9pCjssD653f4reFjoc0jJWXob0VogwGA28ddfd2BZmH vFdKX9XZjh/AvDFseBOPyLcli9Fjxch911KpBsKSmq9q6Q3nUbQd5P8+Xn3Ht2dbwvQLKfh3Kvd FNqXJHVP27uxS4mvgwEAyTBCsh+wVu3B4J55nqzedi1+1qMVpnhLxA3X0F3vTiX5H0iWtIkimfm MJRMtrVfnB7n02Ygu5H2jZFGUlXpS93eEm9XI1fvsP0/mzyvnCA1SlwbA2XdaFbLH0edDX3VAFz audt3Y8np4Ag0nCwAWcyZnVzktz8gpzugw/IsXHAOUdEy4HCSYY7yt7a8lFPhcYTBB0+fUIia6i KYmZeyNZHGp3PE1vH4yxjru1Uh4xy3wzzaaxRIHsGWgEpzp3dkIzjeNC6+6YSWgU/uWIKNXSiip OKEcR5HRjyhW6vEUGX2WrqfNsUbVoTdGOXtjMnkZwwgdWFJ8A7qQyNRmRu8zrWk/lNolXlZoseD N5sezKQ+i951OTx1h1iVSbs6tYzAMRc6W6Li0jKsB8CHLqvGBnHE3n11DJC+yBbn2dKwv0ffUur GZ5X88+ofzEY6vDY+2hujXWxKT65+hirW9+QhQvxpBFLQukUvSWw/luF39lQeE0vyMulTx4OctK imlK6EKYwx9z9Nw== X-Developer-Key: i=krzysztof.kozlowski@linaro.org; a=openpgp; fpr=9BD07E0E0C51F8D59677B7541B93437D3B41629B PHY_CMN_CLK_CFG1 register has four fields being used in the driver: DSI clock divider, source of bitclk and two for enabling the DSI PHY PLL clocks. dsi_7nm_set_usecase() sets only the source of bitclk, so should leave all other bits untouched. Use newly introduced dsi_pll_cmn_clk_cfg1_update() to update respective bits without overwriting the rest. While shuffling the code, define and use PHY_CMN_CLK_CFG1 bitfields to make the code more readable and obvious. Fixes: 1ef7c99d145c ("drm/msm/dsi: add support for 7nm DSI PHY/PLL") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Abhinav Kumar --- Changes in v3: 1. Define bitfields (move here parts from patch #4) --- drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 4 ++-- drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c index 388017db45d802c4ef1299296f932c4182512aae..798168180c1ab6c96ec2384f854302720cb27932 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c @@ -617,7 +617,6 @@ static int dsi_7nm_pll_restore_state(struct msm_dsi_phy *phy) static int dsi_7nm_set_usecase(struct msm_dsi_phy *phy) { struct dsi_pll_7nm *pll_7nm = to_pll_7nm(phy->vco_hw); - void __iomem *base = phy->base; u32 data = 0x0; /* internal PLL */ DBG("DSI PLL%d", pll_7nm->phy->id); @@ -636,7 +635,8 @@ static int dsi_7nm_set_usecase(struct msm_dsi_phy *phy) } /* set PLL src */ - writel(data << 2, base + REG_DSI_7nm_PHY_CMN_CLK_CFG1); + dsi_pll_cmn_clk_cfg1_update(pll_7nm, DSI_7nm_PHY_CMN_CLK_CFG1_BITCLK_SEL__MASK, + DSI_7nm_PHY_CMN_CLK_CFG1_BITCLK_SEL(data)); return 0; } diff --git a/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml b/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml index cfaf78c028b1325682889a5c2d8fffd0268122cf..35f7f40e405b7dd9687725eae754522a7136725e 100644 --- a/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml +++ b/drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml @@ -16,6 +16,7 @@ xsi:schemaLocation="https://gitlab.freedesktop.org/freedreno/ rules-fd.xsd"> +