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 D3F783F23BE for ; Tue, 9 Jun 2026 09:47:14 +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=1780998436; cv=none; b=DLT/ydJzM/ojHvy02oZjE4+uZX1EFQb8iTkvSNYjhrIhXya8pGZLWlgIatbiXohkbh3p95fy55uIvlvLfXDlVra6MQeeLTJoK35XR/0hbHVwCHsa+vdPTC4SdPeR5vY+Koj64aEsRriMm4qeT/j9oL9Dwi3OJBaSmXeVIG9bfRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780998436; c=relaxed/simple; bh=hFDmZxXei1KTLcixeb+NUk/Wwdocsh1JcTngaZx0hsQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LIdxj7dsjD9pBPsZdcMaMS47TIPL3HXYIdOQBqGrxkpEjGRhx2+9PAPcMR2P7FmdBMIVEto4sKptdTsaKPK7n/XATmMVVc6IaH8tq8VBnbRln4SpIS6+cTkWWwAoAAdEcnIR9gEX5dZKVUmOhU03ETpN4IHikJC8cttRnW4VBZ4= 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=ZgzeQM3H; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=hNAuLY3T; 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="ZgzeQM3H"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="hNAuLY3T" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6597rbn61923227 for ; Tue, 9 Jun 2026 09:47:14 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= Sdy8wI2RH27j4YG85JCTBXzxHed9vdoH71Sb++hFk1Y=; b=ZgzeQM3HzTsjqyOd rOqOaMNP6DXU4a1f6C9+goRRq5bBacscyiuspgzTkvyCukq1LUOjPcmhbYLn7U5I kGw2uWpgT3BF/T9wvHuMicbOXNgfFtiMPoWDNSHFiY8gxvvQg8Q8F7UZ05Ljouku igAS9K8opG5DD07YJ49/5MoqPH3Ufih64usvdyJIg2fKnU06dgASQSiDzjmiM1yX rrGfTx+4ojjbZpOggYPkisd0jUJkOl/UVwDRvv1ZWPrc41JLoBU9sbkA5BZL8WVU 2Bb88lqtVeFNDhrapIYqKo54EW9vmAUtvgxanSlzFPKmmihWKBc7JwcfF5pyQkYD BlfDrA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4epee4gjth-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 09 Jun 2026 09:47:13 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-91565f8c589so897042085a.0 for ; Tue, 09 Jun 2026 02:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780998433; x=1781603233; 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=Sdy8wI2RH27j4YG85JCTBXzxHed9vdoH71Sb++hFk1Y=; b=hNAuLY3TvgH0AubaoUJpYhXSuAryD4gnwBCuk3Sq3aOFUFez28tBxrbb6GqPrbtS4g jtF1RfUaW7a/S8DrZSdecfs+cJStWRggagnZvTJGqzJDSGOg/Qd/A7WpApc0xU58ik7O R+iZ2nKRNbbG5vuSBDgBZWnDoerLP5JFZD+9kkDyv61rYh8/BKX2EwSGF0AvdqsummrL h4bBDvcZ91caXLy4PlXc+c+IbED8Ox9pz2y8lzBrC5Eb1Pu8nxIsTN1ZZ5u/C4kk1AHk apnm7SXP67cvAUQOBNQzC3PNxMFbtoAxpbVWJiUwAV8WtipCWpgW+N5JGjmxWxkHZ+Fe jBrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780998433; x=1781603233; 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=Sdy8wI2RH27j4YG85JCTBXzxHed9vdoH71Sb++hFk1Y=; b=MiOrtavXiqrcVAoI+U5YlTpBm8UFHFJnQMJCRRyeN2IY8+HHqZy4t6xf+PbXT+vXDZ OodfNVgNMDBVOSUAzwruKgYbVw+c5KGPkhGUkSpmGYhL1Ksa9y8MwhWvd1uZVbY//f88 ZHTyW4+Y7ttON5B36i3jmaoBqPaELoOir3/Ry01twSfsdlIqFWivJdvGmjOj17HyWaxq FWXzFlc7w/6IEg9QAVryriwVHXASG4HNdsjQNChGbaJiOpvppl39sKzP6g30b6hRls4u lP1d4g62r5i4u4Oiw1qiDWeBT1sncioFEitEEp6SBiD/W4pk5buVi3vpYplcG0XvjoSB DNng== X-Forwarded-Encrypted: i=1; AFNElJ+/hoSVZVnPg4EvGO4zDpy6dw853EcTfZmjFlkpzJerMFdAvwbkY4QDyFrw2R0vDa6+7KlK1g3m7G6lVBE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4py9ul4yp2IIrxIwnII3aXgpk/RhJmmKkKAGv/0xWRTx8snET BUbapX99ZVbhqdE0GoKvJTEL5oawDLDjgPT4LytqvbNFB/6/YlbQ0372zNjNR9XxVmXGG5ntDRx WnY5px6uudSknzFAXc+WkCBRCc14+GgZa7BtlYeGVAufujXjt1jh7xIOHlI0sU4APzV4= X-Gm-Gg: Acq92OGEeRcL9fdELSGX05Nh+RaNXTxsb3qBvJmcYHdcFLBx5aTb5f00TGcXtN4LOWR gi2Nykfe8pYOyDHXu+Mtxdqkp7QHRfa3E2KIKX0i0+P19ZOwAjNkoIHi65mSer8KS6u1ehh1yus 84ZLiap9ot5gANYAuxSI/zFUPitUUi1uIrltHylrhKY2RqAtogVcvOi6h49M4mEOhaJKlqO09bB g23q094rZPfavCsL1+IQ+4cMss0Y4uLVMONa3hp1IIzYbLZwHMk8rPrjgV69b1noUH61xGolbWR JBcLCTGEPaA8AxSkFDrkOuOES02whyjEuUszNk+ahK1EOdV6Q1oDsQJUxomyG8gosHgrGtCFlFP 5EKpH5FvRFwpqnoV4qAXq4GhP2gI5zD6q3Tlkcsodig80XAzp/RZ4K+ZBpfejAhfvqGKl13xZ0W g7zEucxzIzI72/vhe7Zw== X-Received: by 2002:a05:620a:199b:b0:8d7:c82f:ff7b with SMTP id af79cd13be357-915ad31433amr2072749685a.35.1780998433126; Tue, 09 Jun 2026 02:47:13 -0700 (PDT) X-Received: by 2002:a05:620a:199b:b0:8d7:c82f:ff7b with SMTP id af79cd13be357-915ad31433amr2072746985a.35.1780998432672; Tue, 09 Jun 2026 02:47:12 -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 af79cd13be357-9158a00afafsm2047489485a.2.2026.06.09.02.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 02:47:12 -0700 (PDT) From: Yongxing Mou Date: Tue, 09 Jun 2026 17:46:29 +0800 Subject: [PATCH v7 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: <20260609-dp_mstclean-v7-7-ea04113e8233@oss.qualcomm.com> References: <20260609-dp_mstclean-v7-0-ea04113e8233@oss.qualcomm.com> In-Reply-To: <20260609-dp_mstclean-v7-0-ea04113e8233@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=1780998393; l=4059; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=hFDmZxXei1KTLcixeb+NUk/Wwdocsh1JcTngaZx0hsQ=; b=JF48Z/GJSbnZ7/9+9I+TvqmWJrqHdn5mcqHwbMOXjLHOFIsqSag9uEeFiV5Mcq1y32OnonaE3 XFvYmgDpZ5vC2HwI3jlo6NflCi50HfmIDN3dAw2GdOph3ifQF1DsfH3 X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Authority-Analysis: v=2.4 cv=PIs/P/qC c=1 sm=1 tr=0 ts=6a27e121 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=FjMX0bmgnFGAle5WrLgA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: B134LG7Lpotr1jD-Pm7wta8xvnfG9-kc X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjA5MDA5MCBTYWx0ZWRfXxMa1lzh/Aqmr 3L2ozrOPYZOu83wACxmW+7DOTtZy2zU2GVeAlwDhVTio5VipZhmeFIQUv9pNt1JkEEGNBBpdkvX Jfvhxh+CV9cW04lcUVHp0gbkGvJ4ziTGUsFPYOboX8nMtVexT8Z+daJLuIzUZXyknmpSKKSPOKZ 9TG0EcjbxHZes77qVeXSdtm10QE1VS0mmpoRytkhVyMz6juHDtsus440kdxRBrqAjU7b1C0Jf5M GgMFqNxiliW8ajtTLCUrC/X1U6CBIJXsSbt9JA946o8hI+TU9RVOwkD4Re9y3LhP+n+J4wKekaY 3cB49mS5OhOAYDmceLFe1tqY+tzqbFR/wpfX2W6qBIoCV42NnGVsqcQWSJBS+zkBqkVIB5ioPx1 omibUNGPftpXBDZhmDkYT315FCwybCdMsrj2RpNAEfNtZLIZq3IQkKIDWxEK7d7vdcDzJbgGoU7 fyG640aHRktXwK5TMpw== X-Proofpoint-ORIG-GUID: B134LG7Lpotr1jD-Pm7wta8xvnfG9-kc 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-09_02,2026-06-09_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2606090090 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 | 80 ++++++++++++++++++++-------------------- 1 file changed, 41 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..a2c44088e6a6 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2171,6 +2171,41 @@ 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 (WARN_ON_ONCE(ctrl->stream_clks_on)) + return 0; + + 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 +2231,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 +2534,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 +2579,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 +2626,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