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 26BA038F658 for ; Sun, 24 May 2026 10:33:45 +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=1779618827; cv=none; b=pbcmU2Vy7Ghf3T8y9Nn62ticAKE07ngRVFOQxxY5lrXm3XW6scYge5JYwu3p4gZFHREo6BUMJQgxMOQfnauEVfhblLTZ//JOajq0IzkT8nHTzDK6m1h8whoAZewnRVGDlOHvA1NGJMQlxrWCUxRHLALHeMtdus5UGMjoHbNSMvM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779618827; c=relaxed/simple; bh=VlJ+1/FBc9duVlUYHWO2wc4pbzUsDLnVU4RINA0C4eE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WLaOwzfl++bjVlYWHKZjP3wZ3+XGIchkwMZE1qos6oi7ES8vGVpxyGY88LfkNxs66tX0L1ggk/CS5zzzh8p11tzqmBPOpFu4MXJ5hzk3Jd4PDyOuxFpM4bOtfhdM2ut9obK96r2XpJJ/I/rNL5XA/Ac0n7jSR8Q10i3S8t3QyWE= 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=CBi4Y3T/; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=SdMIwsuc; 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="CBi4Y3T/"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="SdMIwsuc" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64O4mwkI3791749 for ; Sun, 24 May 2026 10:33:45 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= jWB2ji/NIriYCqvzWJu07blT4Tg15A2umoRQFrcHfrg=; b=CBi4Y3T/NLLQTavM fTGD0lZf9binU8TuKK1jQOH049BfyDqPnYsasX08KQlZQrk8GSLYgfd6KDU1SAwi DQ6c/wnYkl9RZcYBw5IWt0iAU/d8DvovB2BkLJbsYFVM5yimdwaV6a+PdIO7S4Ay 0N5zu5nG6/xnND72zcjeGJfQ2CO0qN7P1eaKhG9CLGe6TmgyTr0nT0t87kSdyjpj jNdvt8zl88becJJHV4st77qyPmbBtPzwU8qdEHR759vxRzrUsFO90WAb6WXhjm+R GtVBwYhFNwCgrWlmkcnQl4365/OVLVS9mqLstnQTaSB21bfrXhQbWKA+x0rhKNFH FuBLgQ== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eb88w2esw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 24 May 2026 10:33:45 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-63136c0b6fbso13673516137.1 for ; Sun, 24 May 2026 03:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779618824; x=1780223624; 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=jWB2ji/NIriYCqvzWJu07blT4Tg15A2umoRQFrcHfrg=; b=SdMIwsucK6h4QUq5SNm5X8ycb4/ta/e8l5xIGYlKYfXV0YgKtSorUcZOhohnZbVjxJ cCJosnPEd5L51HG8aqKGrY9NHHnpPdlyCEeD/ISvO1izKw+ANwyDKCiTgVMPFKAVXyxU j9qoq5jxaYkO1amISxXvPN0pgXtcRQOynPyPu35/i/prk7tkWVhHjLYwhC6hZBOUX47a bxsLlX8jHOBth2KtFGWECjemPQ3sveXV4w6g2GCWAadGEG2obxr59Gr61Ewikl3FOW2D vob8VQJHETB+UnXoqw6TRGBikRcL7xM0pdH5rCiyT/RQu/adiAzvC9jm7rEzXJwNrg7F EiLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779618824; x=1780223624; 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=jWB2ji/NIriYCqvzWJu07blT4Tg15A2umoRQFrcHfrg=; b=o0MFslVoXpvKmwUNQ2CCwBGY/ntNjTQddDCC7vgiVwh5jUZIW0YpUnSiAH+HG1T3gy t89PZt3x403UeVAy6HcGbNjajUk6a6EODdkJHhSxsr1uhmAXOA9iBsXHQfXtsDM51fZ6 vfRKHBbs2oyoq2QsC2diztfXh7MtfOG0In6hc0IzlqsjKaCLfSa3yGQ6Bs8Kn3MyV4pE erH8s1Uv1BVrGI+GFxnDDFraXOesPm5h6mW569iapCozMGyLKDpPNeJMDeK6sumWWJ34 evnCJJilj2bQnRB/0DsYUiqYF0KaItX4Uj60CeE8fm30Wj7xHKja1CMFKPDfkKXqMHiH b8aw== X-Forwarded-Encrypted: i=1; AFNElJ/GMeCa0O+TntmBHjXBTrip6DuOd9Y0fsI3TWuK3QT6Awf9+b7bhaUDCdtoxrKlVTS1H0VEBnhEI+IYELU=@vger.kernel.org X-Gm-Message-State: AOJu0YztZhZ872wD9L5UNuo8Zo2IvvyQLxJXkySj4H7CclDrDe0JtRyA cbnnBHz5WzigKbn/5HDZbMjHtaeYK06DhR/DTHf6j6txOwcz3aw6bFFCnNSl4Dz2+gYjlsEGzoy 7HWJnSqdz8XOGD/lhruGRURQK1SK0NbQ2Erl5040vLm8sl5/3/5veIm+5Oo4hhDN2uf4= X-Gm-Gg: Acq92OGGfJ12+nMcFEThLXaXv9K/rL1yCMZkmSynO5aspeiEz01ZUmlByqvZgB2uShq OsGfXZ3AWheKGT8wutWE5zikcgT45h5LnB4dEkrd9kekAVlDhvNsiQpVcGprafS3MMANIJ5pCW2 YtLlNU8qnHYaLCuiqS0WGjGNS1ufXP06SmfrdM47kT7iAza/7lW1c8XSqc6UREbU9h3qX7uHMPK gCkD+bm7XMcGkpuBeB7zc6RNeodSU+uNr4UADLKm5Z94SQPGYy/LZk17y/bDOMf3SHWSIVaqIIE rixZsW3qfdVAT2SX6aD6VIKQyn430S0FqpdajsKAYzuKGgb8SE0u0ZpYgzUEtO58b6NcVdwkujL lRS2QX4MJOgcI9qN5FljL7Y0kojcaWV1VKqIxh/oXTfyFJA+q1H62oMVS0MliFE50mZ+fJE8bxl /tSsySTkcv0xtRY5laxYxKhRG52ynrPbd85Wg= X-Received: by 2002:a05:6102:17c2:b0:633:f7ab:6bd5 with SMTP id ada2fe7eead31-673ce1a740dmr599303137.18.1779618824188; Sun, 24 May 2026 03:33:44 -0700 (PDT) X-Received: by 2002:a05:6102:17c2:b0:633:f7ab:6bd5 with SMTP id ada2fe7eead31-673ce1a740dmr599285137.18.1779618823652; Sun, 24 May 2026 03:33:43 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa32cba880sm1816148e87.32.2026.05.24.03.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2026 03:33:41 -0700 (PDT) From: Dmitry Baryshkov Date: Sun, 24 May 2026 13:33:31 +0300 Subject: [PATCH v6 03/10] drm/msm/dp: Read DPCD and sink count in bridge detect() 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: <20260524-hpd-refactor-v6-3-cf3ab488dd7b@oss.qualcomm.com> References: <20260524-hpd-refactor-v6-0-cf3ab488dd7b@oss.qualcomm.com> In-Reply-To: <20260524-hpd-refactor-v6-0-cf3ab488dd7b@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Kuogee Hsieh , Yongxing Mou Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jessica Zhang , Val Packett X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4687; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=LfFUlOISMVD+0rSYX6TFT5QzTXuP4QCzs8WLa+Upwss=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqEtP8b1jf8vWsVak8pEAzirBQ6nFhtNhTuagcJ 2cmHoxsOKWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCahLT/AAKCRCLPIo+Aiko 1TUrCACeoH68ha64/v9DyUk/onMpYPA0TMR46wrUUHV0iskEalybwo/KUI4o8EEmULyjEx4Arwg AUIFJ3s9eTW2BCsaIy25dhLt0H4iGLqiVLZGLEuvPqVG+vxgZu1/EOt/xF/cpN5D1xEBV5ca18K MePZgpqOEqJ6xN+TRzzbam6U23BqvFfTM/KHytunDZRQ1mCHIhxl8Ev2y4ZmcY9h2zpXjLlyPe4 W53JiCw6/Ukwr/uB8Mvu0hDKjOACbqmj5pREIy69UdNqhwNzdUJIgsSSV+42zrwv4+Fs89/2Kj0 a/5YqNwiwJJZ4TJ5sydzkaiVl1kRtbXKCXa3UbxvJddTyiZU X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=S/jpBosP c=1 sm=1 tr=0 ts=6a12d409 cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=jcEwYMPARZwhhGfK5pwA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI0MDEwNyBTYWx0ZWRfX/jy5kwTwtS8f uHSdcl5aOgc5vTAays7XyoMm0xa7w54xdR380nX/uqOVQtR92vFXSb+94TTgmtXwAB4mZVAJgry nUyb1WfZbnq6HHInE4xYJFjU8JY9xrDDyuOAZW7yprK9CuAksuvchMRmd4aIYurLx2djmFdIYvR XhLAoRPkvg2zrfGZsyNsigypj1sNHVBAm+ILWKFzAOcqTI+O0eE3eGP22m4Y2HafG7BgKUt8rXh hkE426XGgGu0jJnmiJF8mzbI2cPGxhNvn6f4m40yj02Mh1jroOQu86GqgNwjy+3wyE0gyYa2AqM w3SkJN8qS/MBYR3neKOyiLoSzBVtQJcQEBRwASehnNaSh/761AlLmmhiSgFNtXD1jvuJCvUcNJY zRgL1Asu+3EoUDXgRAC3DniZyhSdn9hl8nTdj/bo/Dz4paV9n8N3eSl9off2cywYz+FUuFHGeqV We1knubWjKlANt6wIhg== X-Proofpoint-ORIG-GUID: xMJ9Fj5ngT1qgi2wR_JUAS5hJIdVb7HP X-Proofpoint-GUID: xMJ9Fj5ngT1qgi2wR_JUAS5hJIdVb7HP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-24_03,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 impostorscore=0 adultscore=0 phishscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605240107 From: Jessica Zhang Instead of relying on the link_ready flag to specify if DP is connected, read the DPCD bits and get the sink count to accurately detect if DP is connected. Signed-off-by: Jessica Zhang Tested-by: Val Packett # x1e80100-dell-latitude-7455 Tested-by: Yongxing Mou # Hamoa IOT EVK, QCS8300 Ride Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 63 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_drm.c | 20 ------------ drivers/gpu/drm/msm/dp/dp_drm.h | 2 ++ 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 1dd168acbbc3..97c4752005c0 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -1152,6 +1152,69 @@ static int msm_dp_hpd_event_thread_start(struct msm_dp_display_private *msm_dp_p return 0; } +/** + * msm_dp_bridge_detect - callback to determine if connector is connected + * + * @bridge: Pointer to drm bridge structure + * @connector: Pointer to drm connector structure + * + * Returns: where there is a display connected to the DPTX (returning + * disconnected for branch devices without DP Sinks being connected). + */ +enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge, + struct drm_connector *connector) +{ + struct msm_dp_bridge *msm_dp_bridge = to_dp_bridge(bridge); + struct msm_dp *dp = msm_dp_bridge->msm_dp_display; + int status = connector_status_disconnected; + struct msm_dp_display_private *priv; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; + struct drm_dp_desc desc; + int ret; + + dp = to_dp_bridge(bridge)->msm_dp_display; + + priv = container_of(dp, struct msm_dp_display_private, msm_dp_display); + + if (!dp->link_ready) + return status; + + msm_dp_aux_enable_xfers(priv->aux, true); + + ret = pm_runtime_resume_and_get(&dp->pdev->dev); + if (ret) { + DRM_ERROR("failed to pm_runtime_resume\n"); + msm_dp_aux_enable_xfers(priv->aux, false); + return status; + } + + ret = msm_dp_aux_is_link_connected(priv->aux); + if (dp->internal_hpd && !ret) + goto end; + + ret = drm_dp_read_dpcd_caps(priv->aux, dpcd); + if (ret) + goto end; + + ret = drm_dp_read_desc(priv->aux, &desc, drm_dp_is_branch(dpcd)); + if (ret) + goto end; + + status = connector_status_connected; + if (drm_dp_read_sink_count_cap(connector, dpcd, &desc)) { + int sink_count = drm_dp_read_sink_count(priv->aux); + + drm_dbg_dp(dp->drm_dev, "sink_count = %d\n", sink_count); + + if (sink_count <= 0) + status = connector_status_disconnected; + } + +end: + pm_runtime_put_sync(&dp->pdev->dev); + return status; +} + static irqreturn_t msm_dp_display_irq_handler(int irq, void *dev_id) { struct msm_dp_display_private *dp = dev_id; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c index 349175457566..991a3ca1e6bd 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -15,26 +15,6 @@ #include "dp_audio.h" #include "dp_drm.h" -/** - * msm_dp_bridge_detect - callback to determine if connector is connected - * @bridge: Pointer to drm bridge structure - * @connector: Pointer to drm connector structure - * Returns: Bridge's 'is connected' status - */ -static enum drm_connector_status -msm_dp_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector) -{ - struct msm_dp *dp; - - dp = to_dp_bridge(bridge)->msm_dp_display; - - drm_dbg_dp(dp->drm_dev, "link_ready = %s\n", - str_true_false(dp->link_ready)); - - return (dp->link_ready) ? connector_status_connected : - connector_status_disconnected; -} - static int msm_dp_bridge_atomic_check(struct drm_bridge *bridge, struct drm_bridge_state *bridge_state, struct drm_crtc_state *crtc_state, diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h index ec76448e71ae..041aa026ae2e 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -25,6 +25,8 @@ int msm_dp_bridge_init(struct msm_dp *msm_dp_display, struct drm_device *dev, struct drm_encoder *encoder, bool yuv_supported); +enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge, + struct drm_connector *connector); void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, struct drm_atomic_commit *state); void msm_dp_bridge_atomic_disable(struct drm_bridge *drm_bridge, -- 2.47.3