From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 E1CA63932C5 for ; Mon, 20 Jul 2026 06:11:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784527893; cv=none; b=aiBUiij9WQhjLYXdbHhapLsQ3VI0mIJCPi3pf+SLpvEJ8zUKrNFV30nnAE8+OI9utxMC4EXSU558iBL+lrkHbtds1fwvL8q3UyeJ0mhmagQzLwFEKmiI0GeGaWKLCL0QaZ/KedI53AEAJlmctGfEwMPUvK+eJJuyZJ47/NCCMaI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784527893; c=relaxed/simple; bh=u42nKidDiGf3s4uqGsqfLPYmVyOqtiq6FmPfz83VIe0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k36/GZc0lJmnI8rfQCy9n43TM4aAOqj9kTfeNgJnpGnXIdjuFEoXrHwHSoo8A+NVeDySXel0s1Zem0cdArDhYEAPZXPPl51sgB8IZdpBStbUp3rethUqisQnfTl4jQnBgzGz6fGZ20DteuC00GEd42bnwl6ANuOBK8hnBBzR8kM= 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=Ky9TbRx8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Shktv5J5; arc=none smtp.client-ip=205.220.168.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="Ky9TbRx8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Shktv5J5" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66JNstk8901469 for ; Mon, 20 Jul 2026 06:11:21 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= bEWZpd5Gqhtf8XBYTYHEDseLEqITUq5QSnbj3RUGq/w=; b=Ky9TbRx8knauOddX Pk7hl3W85uFyBtKMCwfWklxUngDv5r9eH5guLeJ/IRNYtGg5AGYvFqelijs+VhMb 9nh5NNyYzKZDF6ccFS58Tb9ZtPuZIjugOUL3uO2uHUViHJpIh+5GZAXx6EtoyBRb Uw5y80Fkszmu5j1skXbY11E1tXYBTAT+U+UNIG7avYrO7bfA8sjh41PfNPGOunGs H0JtVYz/kyCkme29aAATmpxDUO4q2Zo3ZwfiQHjJ+kcFshA514/664ndyqI31iGe PsK3fcwBf0KEz2HCsUVLKswTNcChdmTQOvqFDA9ys9B1J++E4rDPXpllz5TXntan gOdQ9A== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fg2bnmne8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 20 Jul 2026 06:11:20 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-8e9489f62bfso216586046d6.2 for ; Sun, 19 Jul 2026 23:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784527880; x=1785132680; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bEWZpd5Gqhtf8XBYTYHEDseLEqITUq5QSnbj3RUGq/w=; b=Shktv5J5xXNGB4G7CMD5alnzeeZXLGo0dn+kptqot2W2+RqBIlnfPTB7YMwkNloJOO SUnEabfKWePpJdGypggX7jWOVr+N4oOON2sAUCjqkSHoaAaQIFMQf23OsUtkLmsBf7Vx LssO8+VbHjw72mpOgs1Hr2CuVmvILEztD20YN+dTs89e81gqVjRoOFd0OvS5vPEnk/vH hrRHBl0ucT+BrFTv5FEDzw7V76FLp1SwDNMlOdAAg6gPwapUWnXkMgFWloIpDzTmuHEU 4t376dacQAwBG6Nu5hydvl+ulPR2r0SXvqrQ5EoJ0QNOWcM5ka1PzS3G19qX9InSytmG q7dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784527880; x=1785132680; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=bEWZpd5Gqhtf8XBYTYHEDseLEqITUq5QSnbj3RUGq/w=; b=dceK16n0W8PDwgknocTpi+NQgfK8hmclIfP3NhKKb6WK557QhmonDJi9gJ5n87ERwN Rby3+/a1K4mM8XzrloUPRKnXkL4Iz+i5qnx8mjRQB61nnIrtc5Z+n92c/Kt77SaxUKVD KyWqDX0mFcMzRlZGBXJOrtr6yg+FATFXfXqQWKSwbIeDgJWIqlAZHIBxGOhfa/pb5XWn 2TBdKr4Hl50/d2mcC/lkfnX4iPDpiqoaAvh40IzN2Ska4fX+3biW3yIdOkLhQNXDauSJ YKgveM3ntvVxD6JKIZWUCQ4XAQmkfgqRwKb1UPQifdNMNSDS3S7kNfqq3SZodFbW3wkp f7LA== X-Forwarded-Encrypted: i=1; AHgh+RoVNDSTpulaQHJuB/H8HOHJXz36S0QP4o/mol+7a1ZrgH3vz843aG3CljSAqvQccsh1IVNU/TkiDZ2uCJI=@vger.kernel.org X-Gm-Message-State: AOJu0YxsZ7klknsRJw6ke/12nwbZQAU4aVExjUlWwiYfBJwojUu8+QQ7 NinOEnDwKNdyhuDQodE9977noKEKLKZolM9mpOo/gPRDPumYS5Ku/c28BRZwu6a+od5/RIcGsH+ lJRwr2GI6MWOrLPKx1LdyjQg1UWJ6iQ8AWwPXYqZFZ/TSK+mnLu9c95LmW44YKSG2KNk= X-Gm-Gg: AfdE7cnfEoU4C/5RhmT4ojKQsXtKK35w4axbJlE3S/3osNDJefUfuvpXLitLUuGFw99 4lcwVbuUnmLAaigAF6i60jMikVunn1MndOkZIRdRzhhLQlyRGfEQqIZx53vSM9L4evd3epy4dFc mwS+ZsieS19Y0x1UpF1uPUPpRHlIz69oQSIMieROtxSen3pot13VfIi0WDIjTvUSWYsTReW0REK fA+HNr1NHooUYtSvqt5OjowkKl6Ok5WDt+ppKdgdmysTD7deZ+m41GeDVA20yhpiPdbmuFfsoaG V5++Tjrquh8jYP/I9JsbObZiTLsEsL6NYhSds8lRLUITJTRuF32afxd7y+9g8YE57DtIzt33p9B ROy1dsOYX8CWQltDCBT4VCg7c5SOO6tqVVm0KbtHCUI+vb2XxDQblOS9DNptfq1o= X-Received: by 2002:ad4:5f06:0:b0:8ea:658b:aff9 with SMTP id 6a1803df08f44-9077852a123mr127421996d6.50.1784527879850; Sun, 19 Jul 2026 23:11:19 -0700 (PDT) X-Received: by 2002:ad4:5f06:0:b0:8ea:658b:aff9 with SMTP id 6a1803df08f44-9077852a123mr127421816d6.50.1784527879383; Sun, 19 Jul 2026 23:11:19 -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 6a1803df08f44-90778588a39sm84793216d6.20.2026.07.19.23.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jul 2026 23:11:19 -0700 (PDT) From: Yongxing Mou Date: Mon, 20 Jul 2026 14:08:14 +0800 Subject: [PATCH v8 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: <20260720-dp_mstclean-v8-7-bea261bf4e7d@oss.qualcomm.com> References: <20260720-dp_mstclean-v8-0-bea261bf4e7d@oss.qualcomm.com> In-Reply-To: <20260720-dp_mstclean-v8-0-bea261bf4e7d@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=1784527840; l=4071; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=u42nKidDiGf3s4uqGsqfLPYmVyOqtiq6FmPfz83VIe0=; b=yxSxLVwOK6nvrS5n2lp55EMGW4AYExevs0LChoKa0lxxQOChL76cEzV+X5VeX11o+v2IFzJ9Q SgbtxVlUmJaBfOqlE7QT6IpVtYGWDAWh2ye1xW4fszxkQHeCnmgC+z/ X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIwMDA2NyBTYWx0ZWRfX8f90v4JrgLvo hUB6YimkIt1oKSSX1XSyQSwPJdVH4U/R/on4sUwZdiwOVzhCEvhWXsCkvxtKUIS8GOWCMI2q+2L hxlS6k/yTcS++WjW9vxbBoJ8XNYgQyr+n8MnEh9WkuRDt7D1r5CWyJ28HUQDWuzJgThJUt584OT FHkN2MSDKF2warFjX+EO3NPXaomzOKBgTObWPMYH2bddWOYs6GMHLtLcXYtBNiy8TUXu00PStXm i5aFjAkqEqTpntUcStiZ/MH/2jpbzBCzY95bvtzFqzeOh1ad4z49F/wyXus+wp47XZQy530ymKl PDeqAvD4wkh6tsOh5rG4oLxd2nE0hAnMwJaSZoQHSvQ4fJejAWsfnOc89fct7VvpZ4hgvlM55HO /XOLbdCckDYlhFb7Tm+iMQEFo7aswToKPdVLQUGh5mXL95DrYtlme3kxSBEeYgo283TPP1Frpxn 1fBzOziX7f0OY9V079A== X-Proofpoint-ORIG-GUID: XJtkGT5QUEgh4R9XFOTyjBFcHX2McqSj X-Proofpoint-GUID: XJtkGT5QUEgh4R9XFOTyjBFcHX2McqSj X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIwMDA2NyBTYWx0ZWRfX7xzchXnI36gx AjE2ZpVrvkrsLqTwXwA2UUpC89b2BN2dkzUKsNjdKAx9mhODOLhrrKlmkqYf5FyXuguSBN2hLir xIA0uNnhKz2WVYgm6tlhJ8PFuBySZkk= X-Authority-Analysis: v=2.4 cv=deOwG3Xe c=1 sm=1 tr=0 ts=6a5dbc08 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=FjMX0bmgnFGAle5WrLgA:9 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-19_08,2026-07-17_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 malwarescore=0 clxscore=1015 phishscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607200067 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, 42 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 711579de899d..a79d9bb93cd0 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -2172,6 +2172,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; @@ -2197,22 +2232,9 @@ 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); + ret = msm_dp_ctrl_on_pixel_clk(ctrl, pixel_rate); + if (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; - } msm_dp_ctrl_send_phy_test_pattern(ctrl); @@ -2515,26 +2537,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); @@ -2573,7 +2582,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; } @@ -2621,11 +2629,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