From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9573D3CC7D1 for ; Tue, 2 Jun 2026 09:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780391518; cv=none; b=suhD3cvgC4gt47Y5Y7mgesoVTJLBFGPVGzBjllNYvrtjHVDC8yeDmMr1WdOZ6vxcCxnZwKxvK1zUiNO+XqZvvO8Ij70UBqyMvnxaIaVgV8eSlIATY4Cdur8iJd/RNViq8tGgL3+QOqoax5wZPQq7PLh5Mu9CEfsQW+l5T+a+FVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780391518; c=relaxed/simple; bh=UaT/1/E05CYDg064KZ/+/vx3fX/KlDmWiJULn3OKuWU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mgetHflnKIjQaK0PAmg5E4HKaikA+uRrzrD7uA39j/p5EoZEATABmpV0FG8U6O2TW7DLWr3wbGrail5soEhJtA+qV5d/JAvSXK+LV+gPPruTDIWtCbAehubanQRruTMKcYds1GKMr1YvLqiBlOWOVjoyZq2AEBYJD6oCTs23+Vk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=YXY4wOTK; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=hNYAaSrB; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="YXY4wOTK"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="hNYAaSrB" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6527gsnC1638562 for ; Tue, 2 Jun 2026 09:11:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= NaE5h732hDoKExFZJ0IFYAnF1/2ly5i/KuKrn899XBU=; b=YXY4wOTKfWxUh3MX G0pk5pl33KEHGfFtIcs7sX1dFl0nMLvLEP6E+3buRHZq9vyzG77Jbyk0uFGI7Tcl IwbxIshdHa+FOWjJd2kzFUuWF/mRDuUPe5mbyZXYVM76i4fIrfufMecfRnJ5+v/h goUfoTUGk4qMCikDNlRzrw3RIDohZjD2vb6lwvubeCYZMLfUZ7wkMZ8SXAy/+I4T CZGIVj2wOfvpi7IcKH4DbmbIJe2zlvz8BabPrG7i2sLsSogBsoA7fBo9ETbs6E/N SR7bmAYiBBgjtsw5VqLuk5uK0lkZCFFPVG2GV68PmmGNKT1UNBBjkVW1MK8muRy7 aVKi0g== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ehu1cgc3r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 02 Jun 2026 09:11:56 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-516d191f2ccso241449951cf.2 for ; Tue, 02 Jun 2026 02:11:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780391516; x=1780996316; 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=NaE5h732hDoKExFZJ0IFYAnF1/2ly5i/KuKrn899XBU=; b=hNYAaSrBC37Zt/BJEFmiC9Y4hUtl5Xxe0yzRKbfzvFpWynqaL5I0B6UdSLtrIkmUb8 JBjzBjLpQfg+UChiTFNmBjmJ7Uk/vgWqXJESKg5GufsD13emA8VfhmsRSQ+1qXWoc5kv Cara5uB6Ghe4z/MIka6uiNbrRkDCR00CElDkPVDLwAYbFCJRE4BOxS57V1dYkDmk7cRT A0wPhbpRlvGzflVmHSJQcVLEQbT1wEi0YwmCIJkSHU1JTsruNT8xB44TunNyUsBYdTM8 U75g++N7MoF0I/zedHyolevSXgcAtOgn9L3YuPyjdt9HRwiTSWRIz9cnHrL/pOMX6895 o9Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780391516; x=1780996316; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NaE5h732hDoKExFZJ0IFYAnF1/2ly5i/KuKrn899XBU=; b=aoUUAIGdz1xY/9ePnp37qt0wPg1QfeH+M3n48f+qhoCSslMAfmrj3bG9A3gsdXvd5m /iRp3T0VehJYx521/XV6EGJTqQ0gHRv9TsfqMLczPO2eS1h38Ff+9xbaLCzHSKI8W09A r9Qe3TdkjQUe6sKHkFm9mRreleSLF1ZTZpez1qgkk7xr1gkWxnx/zPYzlhZIikYax/hU GerbKroYZYHNL0gGReLclO7MxOFIXJpbl+2/xI/NNyX5eOQtol1odVpy9oxJ+FGK++Dv 9QNpAn1ZXaw9/aEUOhT3tE05HUkaAxS6SG1js89Dblr7ziAkSkGPf5+1jNTBYmIkHlmK E7zg== X-Forwarded-Encrypted: i=1; AFNElJ9KrYpH53XsCeINf3zLucJt0IKMMmFeQuE0swl9QOPNb7hzk2hYdu8MfQldRe1ncYo5M8N/tj3sA+sxF5w=@vger.kernel.org X-Gm-Message-State: AOJu0Yyk7YgarUuW5rUv7dE7bNRmcXIhoWYPIfoEYRoPLjnRibjCqVUy 9Rmy10yCh5jG+nYM6scQ8JtWfICRd3z4rrvCh/nm41qBSYI19j6pWctMWbh4JCaPLThbv+OzKTk 8W8JWz4oB2mjYm3uKHKcNaHyz5NqGx5RiH3dDnBeNGEUm0RcHNdeIWpLc1W/eN6IIESE= X-Gm-Gg: Acq92OEwmiv7LJE99SL1VpfcxucBxJYL4VHqj+ZH/AgInnYwI6yngiVuflfEh/FofBR cc19LVXPgCzAZHEMFhX0xn6woxML2Dc4SuZM9HNvxNBNbbImyXNr3HWyHcKWUhblMjw7PwHRah1 yiMaZnAnHUaaZ7shkEydbiMn03Y0TmVPUrkg0jp6xYgup46iYRAnY23zuqmI72e8Z6nY4xF2q7B nHsLtNg0joC7nbDBeBQDXKn6vZ8Dnzz4gGV9J0Kjl7MYMK/SeAkckkteuFYJby6/XbnDJd0JXRT lbWyGZ7tQ0tDWO5ynhlvk9+mF0KgvNATftglkU6ZJcxFk5dc+yRjmfmQo9a7VsFBokEYlzdm4f7 AiYOZNtj4GxSVg+eGXyaKF980rtdlLzwQtz3p+QdT+CzmXkfFVM7zLNg8QsupA0bhR5ZfK0IJf2 nRSYj2D4s+rwvyP9crKw== X-Received: by 2002:a05:622a:5c16:b0:516:d955:ea6 with SMTP id d75a77b69052e-5173a67b6d9mr228736961cf.14.1780391514650; Tue, 02 Jun 2026 02:11:54 -0700 (PDT) X-Received: by 2002:a05:622a:5c16:b0:516:d955:ea6 with SMTP id d75a77b69052e-5173a67b6d9mr228736671cf.14.1780391514240; Tue, 02 Jun 2026 02:11:54 -0700 (PDT) Received: from yongmou2.ap.qualcomm.com (Global_NAT1_IAD_FW.qualcomm.com. [129.46.232.65]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51768c76e53sm12480851cf.4.2026.06.02.02.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 02:11:53 -0700 (PDT) From: Yongxing Mou Date: Tue, 02 Jun 2026 17:11:19 +0800 Subject: [PATCH v6 07/15] drm/msm/dp: move the pixel clock control to its own API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260602-dp_mstclean-v6-7-2c17ff40a9b2@oss.qualcomm.com> References: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@oss.qualcomm.com> In-Reply-To: <20260602-dp_mstclean-v6-0-2c17ff40a9b2@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yongxing Mou , Abhinav Kumar , Dmitry Baryshkov X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780391476; l=4116; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=UaT/1/E05CYDg064KZ/+/vx3fX/KlDmWiJULn3OKuWU=; b=pXXnr4sV6x3w0BqHmYpCW0puPOY9afsmy+fiq1U7KJCeiclrWdmD+o0hAUYlVFWTfxehgqSSl 7HVICWYZPaEDMXk262IaFXRvQb44qsL3sPNCBIBMB/VVmzEtnAYNNbL X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-ORIG-GUID: luZc3BlaGb1BoiYIoBQsNPAcdsNFUXyH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjAyMDA4NiBTYWx0ZWRfXxRoUoQHXnjMX WSW0gPhL0As5IQSjApWog9vq5y90OQh4/P6tsONs4OCYJJEhnK6uWQ0NKjtmbdTUnKBv5ZzybT7 m5eceJq8/7WBrvsiihOUyslBN5jMbi5WADNSM3qPYc51lJxkNaAzRLZ6ERJADOovLzpWrnA/Ujl 78KgBd+12xN59OMezwr8D2c5lwrAiGMHK6FMl8bvHMqtz0ZNkpy9L+qTKNr37WjYeR35CAE4Un6 OgcdoKj5+HFYVPC4NKn/pjdz3KbkNlVvoen4qk+ZyFVnhXL6xl3bD7s6+yqgnQp9+fg0k4191ed U+iwCQOncv7nphR2jiiyX38ItwAqfpUnPJYIWodRPLUdj22tNFzF62ytfA2FikvnuIN4phWSb1g OnHMCyXavvd3Ld32rOQQrfqMma17vUJn85iayi36ralQnM1Fvx4TL+wUNl6e69NWlDnirEMy4Bs ztVo+/AGv0zNkkLqZ4g== X-Proofpoint-GUID: luZc3BlaGb1BoiYIoBQsNPAcdsNFUXyH X-Authority-Analysis: v=2.4 cv=O6IJeh9W c=1 sm=1 tr=0 ts=6a1e9e5c cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=FjMX0bmgnFGAle5WrLgA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-01_07,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 adultscore=0 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606020086 Enable/Disable of DP pixel clock happens in multiple code paths leading to code duplication. Move it into individual helpers so that the helpers can be called wherever necessary. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 81 +++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 1c2eccec6ec6..ac0a2c387f03 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2171,6 +2171,42 @@ static bool msm_dp_ctrl_send_phy_test_pattern(struct msm_dp_ctrl_private *ctrl) return success; } +static int msm_dp_ctrl_on_pixel_clk(struct msm_dp_ctrl_private *ctrl, unsigned long pixel_rate) +{ + int ret; + + ret = clk_set_rate(ctrl->pixel_clk, pixel_rate * 1000); + if (ret) { + DRM_ERROR("Failed to set pixel clock rate. ret=%d\n", ret); + return ret; + } + + if (ctrl->stream_clks_on) { + drm_dbg_dp(ctrl->drm_dev, "pixel clks already enabled\n"); + } else { + ret = clk_prepare_enable(ctrl->pixel_clk); + if (ret) { + DRM_ERROR("Failed to start pixel clocks. ret=%d\n", ret); + return ret; + } + ctrl->stream_clks_on = true; + } + + return ret; +} + +static void msm_dp_ctrl_off_pixel_clk(struct msm_dp_ctrl *msm_dp_ctrl) +{ + struct msm_dp_ctrl_private *ctrl; + + ctrl = container_of(msm_dp_ctrl, struct msm_dp_ctrl_private, msm_dp_ctrl); + + if (ctrl->stream_clks_on) { + clk_disable_unprepare(ctrl->pixel_clk); + ctrl->stream_clks_on = false; + } +} + static int msm_dp_ctrl_process_phy_test_request(struct msm_dp_ctrl_private *ctrl) { int ret; @@ -2196,22 +2232,7 @@ static int msm_dp_ctrl_process_phy_test_request(struct msm_dp_ctrl_private *ctrl } pixel_rate = ctrl->panel->msm_dp_mode.drm_mode.clock; - ret = clk_set_rate(ctrl->pixel_clk, pixel_rate * 1000); - if (ret) { - DRM_ERROR("Failed to set pixel clock rate. ret=%d\n", ret); - return ret; - } - - if (ctrl->stream_clks_on) { - drm_dbg_dp(ctrl->drm_dev, "pixel clks already enabled\n"); - } else { - ret = clk_prepare_enable(ctrl->pixel_clk); - if (ret) { - DRM_ERROR("Failed to start pixel clocks. ret=%d\n", ret); - return ret; - } - ctrl->stream_clks_on = true; - } + ret = msm_dp_ctrl_on_pixel_clk(ctrl, pixel_rate); msm_dp_ctrl_send_phy_test_pattern(ctrl); @@ -2514,26 +2535,13 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train ret = msm_dp_ctrl_enable_mainlink_clocks(ctrl); if (ret) { DRM_ERROR("Failed to start link clocks. ret=%d\n", ret); - goto end; + return ret; } } - ret = clk_set_rate(ctrl->pixel_clk, pixel_rate * 1000); - if (ret) { - DRM_ERROR("Failed to set pixel clock rate. ret=%d\n", ret); - goto end; - } - - if (ctrl->stream_clks_on) { - drm_dbg_dp(ctrl->drm_dev, "pixel clks already enabled\n"); - } else { - ret = clk_prepare_enable(ctrl->pixel_clk); - if (ret) { - DRM_ERROR("Failed to start pixel clocks. ret=%d\n", ret); - goto end; - } - ctrl->stream_clks_on = true; - } + ret = msm_dp_ctrl_on_pixel_clk(ctrl, pixel_rate); + if (ret) + return ret; if (force_link_train || !msm_dp_ctrl_channel_eq_ok(ctrl)) msm_dp_ctrl_link_retrain(ctrl); @@ -2572,7 +2580,6 @@ int msm_dp_ctrl_on_stream(struct msm_dp_ctrl *msm_dp_ctrl, bool force_link_train drm_dbg_dp(ctrl->drm_dev, "mainlink %s\n", mainlink_ready ? "READY" : "NOT READY"); -end: return ret; } @@ -2620,11 +2627,7 @@ void msm_dp_ctrl_off(struct msm_dp_ctrl *msm_dp_ctrl) msm_dp_ctrl_reset(&ctrl->msm_dp_ctrl); - if (ctrl->stream_clks_on) { - clk_disable_unprepare(ctrl->pixel_clk); - ctrl->stream_clks_on = false; - } - + msm_dp_ctrl_off_pixel_clk(msm_dp_ctrl); dev_pm_opp_set_rate(ctrl->dev, 0); msm_dp_ctrl_link_clk_disable(&ctrl->msm_dp_ctrl); -- 2.43.0