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 3C8213E1D1A for ; Mon, 31 Aug 2026 08:19:48 +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=1788164390; cv=none; b=K+YZeWl1bbonYGyqZbiHkfeLZxyjNrbtVWOGg0HCBBCIYWUYiZ0iI9poIPEH3lwquM1S/CVdhX8rVgRiN027J20jH4vAsLinGPFoJNVObYAPEVSUcKnH3KeTkeCn2E5NGex2KY6vFrQEQL6xRAmRsaLSBPGIqY/6q6xb7GPZhB0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788164390; c=relaxed/simple; bh=rsTbGMqi/D3Efy0mtSoSJsilmXUI5sO6mrdxQ2Xe0Tg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qKNkgsPqZYclLRxIpGTgqzjQKDQw0ojX5YLZmaUIQ5UnLV4s70abblwFQMzwxLOsQHo+N3+H+dZ+GGPN5f90IXsLKoV7LWn8TmNS+maL1/c15avUUx4Ky9qhj7pAY8opkPkWkhS0ltEmWxc9IUdzlG8wTMqI2xMlNv76Iofi+CU= 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=fyv/AhFA; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iRwogPFz; 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="fyv/AhFA"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iRwogPFz" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67V7xFev2332458 for ; Mon, 31 Aug 2026 08:19:47 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= jRrYtPpvJzgEakEY+PJv1lS94KQBDZX5lsEjbKy3Gyo=; b=fyv/AhFANsIOc2Bz Z1kJMi9qCtRIDwMSP+86tDEP3ULMnn98kW9eQj6KGOOhF0ZgIckVTJhsL1bJkGag NtTKavgOEDpSzyiLgR/aKZbDhcYyx8Osv7N2/9IPoZmx0o6tr/H6oVku1E0Eo0tR r98eNpXiTYKbmEMczEtjGcZfJQk9AfCbezNIHiUQW9gQRl6NSjpaZA9FZTOlpLlI LG5mqIzY6uy/N8tCg4PLfCF1pjqipw2LcJBZncVjWthE4nQ8tRhiuQA0Y5kwm/hl XKIiVwZmAZx4RFlG1pmQD7QxOF/4m4sCsOtnrYv/SXopXdzZKmf8BHKaR9VI7yX8 1hkX9w== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gbrq8571u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 31 Aug 2026 08:19:47 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93915f50a5cso600749885a.1 for ; Mon, 31 Aug 2026 01:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1788164386; x=1788769186; 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=jRrYtPpvJzgEakEY+PJv1lS94KQBDZX5lsEjbKy3Gyo=; b=iRwogPFzCjSSXHdTwFbKEXv7ElYQ4o5rSFhnNRKVAHxg+9HePV25eFzrBQI2KrMofS Rlhl8wJOdnypXj7KCGsJ1FMiYiFYZPfLkoTVnJOdSteuzVouZ/x9YthryJtjl6jTEkHj iV+sS08zdpLQQsBoDTufGDXT9lZrCJ9aMnOVAh3LGsHnJIsmxki4Fop/SLGaFmd61PaV w9KdudcN1goJgBvT5oUVky0XIh1yIliZMN4H/kWiJoLU5qa7t42SBt3L4g4PBzebVD5T O7Cxo1lUW82o3y9J9f7rNZvMrltAKVIBJSjZwWikSY4/HOmD8kHrfA1ptUdzQV/FrYcZ GBSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788164386; x=1788769186; 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=jRrYtPpvJzgEakEY+PJv1lS94KQBDZX5lsEjbKy3Gyo=; b=Y4qnfcpPwjN+eyBIKQyV/TI7Bl/2xyIJiCaL0l1S5LB5lFqKSdjP0feqKvulnNvvYE DFowuN+j+kff/pXj9DAw0fSgXIz2E2QMfksPi66ZKiv5pDxRqgzg8W/dEmD17TdXYaR4 SEOzLKjyRtoAwGKgKRN3jNiPpwKx4APecq/dd5tOTlLnjKkqshmyRFI2wS+ZDWXNBsU9 aV1O0cLENkGQ2VH1GDHyWV5vP5PZIelgaUgU3wCfqp2kG6AuvXUcrYS0/uX2CEvvpEWh 0xhFYz7fN9Gy8pQe40zDEpRCI0ha2hNWFUTVn0TIh0nXYbSvXrf7wmjjGDFYSDrmQAP3 H6aw== X-Forwarded-Encrypted: i=1; AHgh+RqKL+CNeCaEpv1D3Xg/gcyjzLzcLkSfEJNP0zQ1tnLS/mSL4gvS3YIImLScDpmWMq/suebaveOyOufNUIQ=@vger.kernel.org X-Gm-Message-State: AFuF++mHMdR/Bc13xf07i9SrVpGVkzP2DFBCDW5rG7iVf/KuBOhzfjMa 9iQ4K/JckcRNfK2Ib8+D4Rka8AB+HfFwN6cLbOxFSsP4WlXo3ZeZivj5btcXsK0r8PxAB2bcRtu vIPsxfgPdidqoMSuHQHgSzWzjq6nh7hXnvDRHLmDb3eTJnko/9FAQ7CJ8o8sQdRGfWZ0= X-Gm-Gg: AR+sD11ldLXAUuw2R8+opzRTOCdV+Yh6G8U/8thWIoOimh7AIfN3/NxLDrh96jIZcXK +JIhFR1tL4UUyYGGeASa5We+PqgezNw619VtNCea5uEvFfJBQXKTTxjgDZEGkX6qxyIniPS7kTo 7EfpkfLX+9S8p5TMASvdXk4W+QkdL0ZdizPsTSn6ygoRYCYxOK5ffQevqfzMrK7Chn/ypMmFKy7 +tsfDTxFNFUtd+Y/daZml/xKNvVuXFAz4PcoKEeHYRp7MiD6tIwxze87gngSZ64FCs60uRrlnFJ IJFFETJzgOInkqzmjAz0IWaitw1Rg1aw0x5HneclmGDFnyuncQZvGJaTrvEqyih1QLxJXVIITOq RDpHlN0jUcUyXvAlIj8bm85e5iZBuciJfQSgHp3cLyXPIk94mxC7OOwVCvFemD7I= X-Received: by 2002:a05:620a:4405:b0:934:b798:c245 with SMTP id af79cd13be357-93936d0293emr611180385a.16.1788164386432; Mon, 31 Aug 2026 01:19:46 -0700 (PDT) X-Received: by 2002:a05:620a:4405:b0:934:b798:c245 with SMTP id af79cd13be357-93936d0293emr611175285a.16.1788164385790; Mon, 31 Aug 2026 01:19:45 -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-93917236b86sm735974285a.13.2026.08.31.01.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 01:19:45 -0700 (PDT) From: Yongxing Mou Date: Mon, 31 Aug 2026 16:17:41 +0800 Subject: [PATCH v6 24/29] drm/msm/dp: add HPD callback for dp MST 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: <20260831-msm-dp-mst-v6-24-c91d35d6fb9e@oss.qualcomm.com> References: <20260831-msm-dp-mst-v6-0-c91d35d6fb9e@oss.qualcomm.com> In-Reply-To: <20260831-msm-dp-mst-v6-0-c91d35d6fb9e@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang , Jessica Zhang 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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788164246; l=5866; i=yongxing.mou@oss.qualcomm.com; s=20250910; h=from:subject:message-id; bh=BbNlDqCJNiGbUB7FO4KoLqLxFy+/jxUEkwHF+8lImVQ=; b=+sq47yHGy9lKZu3Jf5gVP2ZS5N9oOOOf7FlvlLNtHA5RrL9sNU9+ozhC6HiCWz0lFsVz2NUoq 8qP9lH5R70zBoYSVMp5uLJK5E0z5k7VLNz11uh7hl8upJ6Z7VckSSwA X-Developer-Key: i=yongxing.mou@oss.qualcomm.com; a=ed25519; pk=rAy5J1eP+V7OXqH5FJ7ngMCtUrnHhut30ZTldOj52UM= X-Proofpoint-GUID: CsEGIP_znB1sdk2rnkr1bdvT-FOXESMQ X-Proofpoint-Spam-Info: AW1haW4tMjYwODMxMDA3MCBTYWx0ZWRfXw6N+aqSfnvxr 8PT3El4gTo+askz6CNbCVRQAtr4DtY6UwXSKjNsHjOHGzYNUW+kXhALw6Eo6+dSiDUYw2JLl0gD GlIhI0Te5JkC8ywq0dh8gUzNlHou3jc= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODMxMDA3MCBTYWx0ZWRfX+iQhOD6+urDj 4fMVoZM7vo7Lp9S13bMZXWzkdPs8MDv23vRphxoIHgOB4IrhB3OZ0dwZOY+3DXbk2tkRRN0GxRV DtB0f34K2sBjecNTi+ni401LL0efLOzRp7p1RHDxPxIYZwxZ6pklzljA7N48x3x1xDMDbhP3g2E BDxVOtUm0Ps3gN3kGPrXj48aXq5Fe7rXMSikiU7v5YGhdB4Gpqtutcmpm3pYp/bGPp8fgXSp+uv IuMR35A3417NvLOER9L4v2uCNWfaUnPNXJSWUizpd59LQ8rOBW1WOg3Y2njKBytmeUGDCKeZW/g JxATskkQoa9c9b0/45ypGq+A9M5LB+YJQ3MAPYznZ96Yo79GwRmpKrV4k3/dIxsMID2Sp0OVB9d W6Wd+AIBdEgcD3XEM1cDB3M5NV9TQSAk2mh6/ur+JyIR9Upg+VinbmQ8lehoqcr4az6D6O4p+kk q/+wo8wZXILdqfGZh0w== X-Authority-Analysis: v=2.4 cv=ZOPnX37b c=1 sm=1 tr=0 ts=6a953923 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=C3Dk8TwHQYyIj7nOf9RCJw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=aoVTMipVTiCx4Xnk7jUA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: CsEGIP_znB1sdk2rnkr1bdvT-FOXESMQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-31_03,2026-08-27_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 impostorscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608310070 From: Abhinav Kumar Add HPD callback for the MST module which shall be invoked from the dp_display's HPD handler to perform MST specific operations in case of HPD. In MST case, route the HPD messages to MST module. Signed-off-by: Abhinav Kumar Signed-off-by: Yongxing Mou --- drivers/gpu/drm/msm/dp/dp_display.c | 26 +++++++++++++++++----- drivers/gpu/drm/msm/dp/dp_mst_drm.c | 44 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_mst_drm.h | 1 + 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index c015af868801..22b925277462 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -416,6 +416,9 @@ static int msm_dp_hpd_plug_handle(struct msm_dp_display_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); + if (dp->plugged && dp->msm_dp_display.mst_active) + return 0; + guard(mutex)(&dp->plugged_lock); ret = pm_runtime_resume_and_get(&pdev->dev); @@ -506,12 +509,18 @@ static int msm_dp_irq_hpd_handle(struct msm_dp_display_private *dp) { u32 sink_request; int rc = 0; + struct msm_dp *msm_dp_display = &dp->msm_dp_display; /* irq_hpd can happen at either connected or disconnected state */ drm_dbg_dp(dp->drm_dev, "Before, type=%d, sink_count=%d\n", dp->msm_dp_display.connector_type, dp->link->sink_count); + if (msm_dp_display->mst_active) { + msm_dp_mst_display_hpd_irq(&dp->msm_dp_display); + return 0; + } + /* check for any test request issued by sink */ rc = msm_dp_link_process_request(dp->link); if (!rc) { @@ -1056,10 +1065,16 @@ static irqreturn_t msm_dp_display_irq_thread(int irq, void *dev_id) drm_bridge_hpd_notify(dp->msm_dp_display.bridge, connector_status_connected); - /* Send HPD as connected and distinguish it in the notifier */ - if (hpd_isr_status & DP_DP_IRQ_HPD_INT_MASK) - drm_bridge_hpd_notify(dp->msm_dp_display.bridge, - connector_status_connected); + /* Temporary until DRM IRQ support is finalized, then switch to + * drm_bridge_hpd_notify(). + */ + if (hpd_isr_status & DP_DP_IRQ_HPD_INT_MASK) { + if (dp->msm_dp_display.mst_active) + msm_dp_irq_hpd_handle(dp); + else + drm_bridge_hpd_notify(dp->msm_dp_display.bridge, + connector_status_connected); + } ret = IRQ_HANDLED; @@ -1717,7 +1732,8 @@ void msm_dp_bridge_hpd_notify(struct drm_bridge *bridge, msm_dp_hpd_plug_handle(dp); } } else { - msm_dp_hpd_unplug_handle(dp); + if (hpd_link_status == ISR_DISCONNECTED) + msm_dp_hpd_unplug_handle(dp); } pm_runtime_put_sync(&msm_dp_display->pdev->dev); diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c b/drivers/gpu/drm/msm/dp/dp_mst_drm.c index 03f9c95ca686..2e625a7db981 100644 --- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c @@ -35,6 +35,8 @@ struct msm_dp_mst { u32 max_streams; /* Serializes concurrent stream link-state access across streams. */ struct mutex mst_lock; + /* Serializes HPD IRQ handling between IRQ handler and poll_hpd_irq. */ + struct mutex hpd_irq_lock; struct msm_dp_link_info link_info; }; @@ -326,6 +328,39 @@ int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, unsigned int stream_id, return 0; } +void msm_dp_mst_display_hpd_irq(struct msm_dp *dp_display) +{ + int rc; + struct msm_dp_mst *mst = dp_display->msm_dp_mst; + u8 ack[8] = {}; + u8 esi[4]; + unsigned int esi_res = DP_SINK_COUNT_ESI + 1; + bool handled; + + guard(mutex)(&mst->hpd_irq_lock); + + rc = drm_dp_dpcd_read_data(mst->dp_aux, DP_SINK_COUNT_ESI, esi, 4); + if (rc < 0) { + DRM_ERROR("DPCD sink status read failed, rlen=%d\n", rc); + return; + } + + drm_dbg_dp(dp_display->drm_dev, "MST HPD IRQ: esi=%*ph\n", 4, esi); + + rc = drm_dp_mst_hpd_irq_handle_event(&mst->mst_mgr, esi, ack, &handled); + + if (handled) { + rc = drm_dp_dpcd_write_byte(mst->dp_aux, esi_res, ack[1]); + if (rc < 0) { + DRM_ERROR("DPCD esi_res failed. rc=%d\n", rc); + return; + } + + drm_dp_mst_hpd_irq_send_new_request(&mst->mst_mgr); + } + drm_dbg_dp(dp_display->drm_dev, "MST display hpd_irq handled:%d rc:%d\n", handled, rc); +} + static struct drm_encoder * msm_dp_mst_atomic_best_encoder(struct drm_connector *connector, struct drm_atomic_commit *state) { @@ -441,8 +476,16 @@ msm_dp_mst_add_connector(struct drm_dp_mst_topology_mgr *mgr, return NULL; } +static void msm_dp_mst_poll_hpd_irq(struct drm_dp_mst_topology_mgr *mgr) +{ + struct msm_dp_mst *mst = container_of(mgr, struct msm_dp_mst, mst_mgr); + + msm_dp_mst_display_hpd_irq(mst->msm_dp); +} + static const struct drm_dp_mst_topology_cbs msm_dp_mst_drm_cbs = { .add_connector = msm_dp_mst_add_connector, + .poll_hpd_irq = msm_dp_mst_poll_hpd_irq, }; int msm_dp_mst_mgr_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_aux *drm_aux) @@ -471,6 +514,7 @@ int msm_dp_mst_mgr_init(struct msm_dp *dp_display, u32 max_streams, struct drm_d } mutex_init(&mst->mst_lock); + mutex_init(&mst->hpd_irq_lock); dp_display->msm_dp_mst = mst; return 0; } diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.h b/drivers/gpu/drm/msm/dp/dp_mst_drm.h index 89f73b1db2e7..8546214cbca1 100644 --- a/drivers/gpu/drm/msm/dp/dp_mst_drm.h +++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.h @@ -10,5 +10,6 @@ int msm_dp_mst_mgr_init(struct msm_dp *dp_display, u32 max_streams, struct drm_dp_aux *drm_aux); int msm_dp_mst_attach_encoder(struct msm_dp *dp_display, unsigned int stream_id, struct drm_encoder *encoder); +void msm_dp_mst_display_hpd_irq(struct msm_dp *dp_display); #endif /* _DP_MST_DRM_H_ */ -- 2.43.0