From nobody Tue Apr 7 10:53:42 2026 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 881F0272801 for ; Sat, 14 Mar 2026 01:09:46 +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=1773450588; cv=none; b=HXZ7qJv8uabgZQCg9G+YAWLbnJumR09A/nucQbxkwJaHTYihwT6I034Rdyf/fkoRDl/kXvKhJoCWmvAj3cXV0kBiFMIZlO9gtASPEmyPtJPPebv+nHWVleynFSzljw+uF5l5j8A0Qua7x6Gh014v0Im8acJPY9mGID7D47U4BIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773450588; c=relaxed/simple; bh=MDe7U9RsDHXV+2bJl632vfxF4W9rCCfL29yWTM6+O4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FzkMf0tdJ3q4P39B0qyBejAqxzCzKwLySL5pb43NrIGZXXVbWP73yTAVD9uy3FJR8ApwuqKW2O1wkljKT4xQl8qk6Osv0tlu4rnL45LCoUxFSk93dECePzyJ0P7Kn25P/KmHLwBplC3e2iETuheaI3FOL3sLP6yu7oqWfVhozsg= 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=JUC8pgl4; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=IQAvzxl6; 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="JUC8pgl4"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="IQAvzxl6" 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 62DFXGhY437734 for ; Sat, 14 Mar 2026 01:09: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= 2UrDrn2pfKZTOmcACEWoN/bHKLN3H9Y3BpTX9LllKAY=; b=JUC8pgl4FCzZ7KRs nw87nrW3tkrEMfv7lc+oUnPQ0qzlwdJ7nFBtSyqvlRqk4gApfDmFJs+XQh0Oy4qf eoGyNm/DMZWESe7QsSp6IgPNIKp+WVilqxb+hSQzMR4Y8XN79TqVSVZ2269QBs/T ly237lzgPgAvgBnGQJmDXjRa4qAhe0IdFxSj6y5+ntSIzXHgD/1dkiFHLdlOUyE4 C1UwYGXQ4wBwJGkoMXpec3LjkK7pFQ32hdWcQsvTOTw+jYek016ETCNp4n1H2qrQ 8qnj9rl1aYJRdt3gZh5i9bXyYVEi14EpHUVt43wGi4GiGISqfOB5ixrEuKV+2VqL RuVncQ== 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 4cvnax9m18-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 14 Mar 2026 01:09:45 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8cd80c4965aso1769415885a.1 for ; Fri, 13 Mar 2026 18:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773450584; x=1774055384; 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=2UrDrn2pfKZTOmcACEWoN/bHKLN3H9Y3BpTX9LllKAY=; b=IQAvzxl6cN51y/LBjO0g9kY7lnCAlRd+Sh9sQTqn3aWAx+yUXcKC+FFyz/ityi9rZc qDFqZP490hNgwZNe5Qu2BJBUVMewY4YInMXnywyMLe1lwLtuRELLAGnTDhLfYBKzjtm4 BLOPIkJYyOQNb/LC0etquTxOeQjWQD8nsLH62a7SM9mLMO6woZeA4daQcKKQxsQifTmy KK4zgCf0RUHjvseByrMa6YhJ19WRsN/bopl8QX8qJp6yAFLVqRIEauFY0DWHRerwRgeP fUYf+urthOglCJZZ7cY1t9AWxST9otylq/zvrU/TmqC6DKpadtX9JOcKbVK9cSkSjw5n qphA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773450584; x=1774055384; 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=2UrDrn2pfKZTOmcACEWoN/bHKLN3H9Y3BpTX9LllKAY=; b=rgJeKQeZf/sb8dA2wGUbizw+ofcYIdyCJvqM6ufNtojDATADOgscf/pG/Wn4LOlWv6 tSeb1SXEHrISSuIerwbQ6fm1BuaKONfHVWQO6h3ecelSXrWn6liJ/un82H8j6g1ZioQI Zr9SzslYWqIlwb5d4TvIHrqRusqAs0uS3ubRAQcXfFp11sb9GZrDG+qwF6d0IYIPXvV0 dpljDg2Jvun+eKU6mVQpoSxtczSQ0Di44YHRyYg7qImTp0Q9ZGUjfvJCE9aOqEtO8RbT nepdz2KUnwffIRXf1dIQDTZWlQozL0wKjmWDaYRWOSfc8J15jF8LwwTZM2Ggv3Z4GQo5 DZ9A== X-Forwarded-Encrypted: i=1; AJvYcCWi5tseEksTCcK48dePx0zOAKD827ISEB3FYtzG4gCD8eLxRkHO0ZvLn7RXdPzp3p5YrWIxnvGrtQmSn+Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyXFM15/wBXgov0tvDl6qUtBtVAxtD20ic07zeQURdYKBEDb+kD tZx4184ZefUYfERLsOaVGk5gufyXJLBANiNkNxZe24KhU3hloZm0apgKJCyOC5+XGj5TYgT07ML s8UyQKr8qjAVIp2j9YEbqqkC6tTk/Y3q8TIz4jmFfWd90TvJjlwfBRhfTyxVi/GdyxjY= X-Gm-Gg: ATEYQzxkqr+3zgu07nPCQyJ+AuCj17wOBLsbo4A9WswTDqLYkgzkxZ7HWcQg+1FUoWN 5g0yO83TkpQaTfGcq4HpVKaHF/2YbMOZcI61V0qjEweMbMHeoDFMtQQq3z3IZx+0rLnFucanntg OKT8F4sPj9gr79PE0VKyrBW58jaW2vizg8jKu+doptnxgALVvaWatRChJdoCsEl4BDna6tjJ65F 0YHwo2vPUZVjimIYDO0JhLrcEt3d9EVg4YILRL2E4RDgiu3IxRd0g8ilYOrxMJfGqrWWBUNQUT5 oj9S5FNQ9sTyHCVeRaJx5qtrc/kp6Z0c1Gz5NbYqyfKlA8nZhGUUT5D9qyLlK1GT91e+EN02oDQ Dv4rwdLsoR1Kk1JLAI8L0VRHVGGwFJ3Jo9dYi53q/3j8+64DR+L/IqH/2EsFhM5QqnR926lc5Jt mRcQUA/nMQpuh3FcueE8suyZ7uOh3Z13ZEML4= X-Received: by 2002:a05:620a:1711:b0:8cd:9584:632a with SMTP id af79cd13be357-8cdaa8ab027mr1119963885a.41.1773450584118; Fri, 13 Mar 2026 18:09:44 -0700 (PDT) X-Received: by 2002:a05:620a:1711:b0:8cd:9584:632a with SMTP id af79cd13be357-8cdaa8ab027mr1119961685a.41.1773450583636; Fri, 13 Mar 2026 18:09: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-5a156366b22sm1806805e87.77.2026.03.13.18.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 18:09:41 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 14 Mar 2026 03:09:13 +0200 Subject: [PATCH v5 09/10] drm/msm/dp: turn link_ready into plugged 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: quoted-printable Message-Id: <20260314-hpd-refactor-v5-9-0c8450737d64@oss.qualcomm.com> References: <20260314-hpd-refactor-v5-0-0c8450737d64@oss.qualcomm.com> In-Reply-To: <20260314-hpd-refactor-v5-0-0c8450737d64@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=11248; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=MDe7U9RsDHXV+2bJl632vfxF4W9rCCfL29yWTM6+O4w=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBptLU0RN/GdnZPPip1huXxiqgajf+0Hi/LOyBCs /hfcNeUNDGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabS1NAAKCRCLPIo+Aiko 1cRHCACsHIr/u4TXPlaZL/jz67bawo9+vJfuBxm1A5HZl2NfQiHH7zSFdcEi4BmLhiYIf7nta4+ f4cdD4Mkn2AXDws1fe7ZQ4MbM5mJIWOUy6ic1Z7wjyn+9DTvp2w2vH7SQd90lu5KIoz2ouiHTKY NG6IMK9GU7zcR2twfvMxnEm3GTlpbbsRv9EpkPFy9aQ/XD4tRSUp54ko2YFlTDQFp8CBbj1A/JB 2k5nAyn9tyyA4dHUfpnChWDAPNHM16w61inIY/xrHUDHlEZ0l4wnZ8Y1B3yC4eDunJyKsdQKq7o /DOKTXym0amNnJRf/tX+OshsmQfKxdbX6bBbel/R9PABwHI5 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 6FftNRkJFvF0B7us6TrwcnsJGfq_7xOR X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE0MDAwNiBTYWx0ZWRfX3PWC8iCzmaSk Ou+UFSgIH4LAnzoONajFzlr8GEHvH8rjVWYVAf6AEicRAocbhpMI55o+efZNk1bYhIF0n48/LoK RI+kR7DEirUDDuDsn8t8Zie8lTdS2BM/Cu4TeB3U7WOJ4xXPs+08tZCVaDVo4hnWcQdC7qCf564 c9ikUGk7wTU5de2RhHFSQPzKSSUUEm1jiRcYulvL29juxpsOnNEv+Lyozn8nxcpto/0+ARsQXvX cEdoQEgqQ/3MsvMkbRdS8aVIyiwZAxKQqQQePw5VNmgZUol3Q1SkoDe5ROUD7lAnaW40/NBM7YY vpfsds3GDiiTj/Q8tjzS7ipwA8nypRJ2WYQOopdc4PCRHGu796PobSbBv6Mnt39RYQhkOWHobLq cfwvimtWXBgrs42YOjg4UapA5FZDWS6tbVHBsYEdztcTu2Og+xb6n54WlJ5Ob0F7wUZ4ptUKvX1 ZX+Kqd7rmaV/AH+yHng== X-Authority-Analysis: v=2.4 cv=X5Ff6WTe c=1 sm=1 tr=0 ts=69b4b559 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=n7_vWGaP1GUJy7dh50EA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-ORIG-GUID: 6FftNRkJFvF0B7us6TrwcnsJGfq_7xOR 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-03-13_05,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603140006 Tracking when the DP link is ready isn't that useful from the driver point of view. It doesn't provide a direct information if the device should be suspended, etc. Replace it with the 'plugged' boolean, which is set when the driver knows that there is DPRX plugged. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 94 ++++++++++++++++++++++-----------= ---- drivers/gpu/drm/msm/dp/dp_display.h | 1 - drivers/gpu/drm/msm/dp/dp_drm.c | 41 ++-------------- 3 files changed, 61 insertions(+), 75 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index b4deeea0ec59..0a38957ea901 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -53,6 +53,9 @@ struct msm_dp_display_private { bool phy_initialized; bool audio_supported; =20 + struct mutex plugged_lock; + bool plugged; + struct drm_device *drm_dev; =20 struct drm_dp_aux *aux; @@ -284,8 +287,6 @@ static int msm_dp_display_process_hpd_high(struct msm_d= p_display_private *dp) dp->panel->dpcd, dp->panel->downstream_ports); =20 - dp->msm_dp_display.link_ready =3D true; - dp->msm_dp_display.psr_supported =3D dp->panel->psr_cap.version && psr_en= abled; =20 dp->audio_supported =3D info->has_audio; @@ -303,7 +304,7 @@ static int msm_dp_display_process_hpd_high(struct msm_d= p_display_private *dp) return rc; } =20 -static void msm_dp_display_host_phy_init(struct msm_dp_display_private *dp) +static bool msm_dp_display_host_phy_init(struct msm_dp_display_private *dp) { drm_dbg_dp(dp->drm_dev, "type=3D%d core_init=3D%d phy_init=3D%d\n", dp->msm_dp_display.connector_type, dp->core_initialized, @@ -312,7 +313,10 @@ static void msm_dp_display_host_phy_init(struct msm_dp= _display_private *dp) if (!dp->phy_initialized) { msm_dp_ctrl_phy_init(dp->ctrl); dp->phy_initialized =3D true; + return true; } + + return false; } =20 static void msm_dp_display_host_phy_exit(struct msm_dp_display_private *dp) @@ -366,14 +370,6 @@ static int msm_dp_display_handle_irq_hpd(struct msm_dp= _display_private *dp) u32 sink_request =3D dp->link->sink_request; =20 drm_dbg_dp(dp->drm_dev, "%d\n", sink_request); - if (!dp->msm_dp_display.link_ready) { - if (sink_request & DP_LINK_STATUS_UPDATED) { - drm_dbg_dp(dp->drm_dev, "Disconnected sink_request: %d\n", - sink_request); - DRM_ERROR("Disconnected, no DP_LINK_STATUS_UPDATED\n"); - return -EINVAL; - } - } =20 msm_dp_ctrl_handle_sink_request(dp->ctrl); =20 @@ -392,11 +388,11 @@ static int msm_dp_hpd_plug_handle(struct msm_dp_displ= ay_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); =20 - if (dp->msm_dp_display.link_ready) - return 0; + mutex_lock(&dp->plugged_lock); =20 ret =3D pm_runtime_resume_and_get(&pdev->dev); if (ret) { + mutex_unlock(&dp->plugged_lock); DRM_ERROR("failed to pm_runtime_resume\n"); return ret; } @@ -406,18 +402,16 @@ static int msm_dp_hpd_plug_handle(struct msm_dp_displ= ay_private *dp) msm_dp_display_host_phy_init(dp); =20 ret =3D msm_dp_display_process_hpd_high(dp); - if (ret) { /* link train failed */ - dp->msm_dp_display.link_ready =3D false; - msm_dp_aux_enable_xfers(dp->aux, false); - pm_runtime_put_sync(&pdev->dev); - } =20 drm_dbg_dp(dp->drm_dev, "After, type=3D%d sink_count=3D%d\n", dp->msm_dp_display.connector_type, dp->link->sink_count); =20 - /* uevent will complete connection part */ - return 0; + dp->plugged =3D true; + + mutex_unlock(&dp->plugged_lock); + + return ret; }; =20 static void msm_dp_display_handle_plugged_change(struct msm_dp *msm_dp_dis= play, @@ -446,8 +440,12 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_disp= lay_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); =20 - if (!dp->msm_dp_display.link_ready) + mutex_lock(&dp->plugged_lock); + if (!dp->plugged) { + mutex_unlock(&dp->plugged_lock); + return 0; + } =20 /* triggered by irq_hdp with sink_count =3D 0 */ if (dp->link->sink_count =3D=3D 0) @@ -463,8 +461,6 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_displ= ay_private *dp) dp->panel->dpcd, dp->panel->downstream_ports); =20 - dp->msm_dp_display.link_ready =3D false; - /* signal the disconnect event early to ensure proper teardown */ msm_dp_display_handle_plugged_change(&dp->msm_dp_display, false); =20 @@ -472,8 +468,12 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_disp= lay_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); =20 - /* uevent will complete disconnection part */ - pm_runtime_put_sync(&pdev->dev); + if (dp->plugged) { + pm_runtime_put_sync(&pdev->dev); + dp->plugged =3D false; + } + mutex_unlock(&dp->plugged_lock); + return 0; } =20 @@ -820,41 +820,49 @@ enum drm_connector_status msm_dp_bridge_detect(struct= drm_bridge *bridge, int status =3D connector_status_disconnected; u8 dpcd[DP_RECEIVER_CAP_SIZE]; struct drm_dp_desc desc; + bool phy_deinit; =20 dp =3D to_dp_bridge(bridge)->msm_dp_display; =20 priv =3D container_of(dp, struct msm_dp_display_private, msm_dp_display); =20 - if (!dp->link_ready) - return status; - + mutex_lock(&priv->plugged_lock); ret =3D pm_runtime_resume_and_get(&dp->pdev->dev); if (ret) { DRM_ERROR("failed to pm_runtime_resume\n"); + mutex_unlock(&priv->plugged_lock); return status; } =20 + phy_deinit =3D msm_dp_display_host_phy_init(priv); + msm_dp_aux_enable_xfers(priv->aux, true); =20 ret =3D msm_dp_aux_is_link_connected(priv->aux); - if (!ret) { + DRM_DEBUG_DP("aux link status: %x\n", ret); + if (!priv->plugged && !ret) { DRM_DEBUG_DP("aux not connected\n"); + priv->plugged =3D false; goto end; } =20 ret =3D drm_dp_read_dpcd_caps(priv->aux, dpcd); if (ret) { DRM_DEBUG_DP("failed to read caps\n"); + priv->plugged =3D false; goto end; } =20 ret =3D drm_dp_read_desc(priv->aux, &desc, drm_dp_is_branch(dpcd)); if (ret) { DRM_DEBUG_DP("failed to read desc\n"); + priv->plugged =3D false; goto end; } =20 status =3D connector_status_connected; + priv->plugged =3D true; + if (drm_dp_read_sink_count_cap(connector, dpcd, &desc)) { int sink_count =3D drm_dp_read_sink_count(priv->aux); =20 @@ -865,7 +873,21 @@ enum drm_connector_status msm_dp_bridge_detect(struct = drm_bridge *bridge, } =20 end: - pm_runtime_put_sync(&dp->pdev->dev); + /* + * If we detected the DPRX, leave the controller on so that it doesn't + * loose the state. + */ + if (!priv->plugged) { + if (phy_deinit) { + msm_dp_aux_enable_xfers(priv->aux, false); + msm_dp_display_host_phy_exit(priv); + } + + pm_runtime_put_sync(&dp->pdev->dev); + } + + mutex_unlock(&priv->plugged_lock); + return status; } =20 @@ -1123,6 +1145,8 @@ static int msm_dp_display_probe(struct platform_devic= e *pdev) (dp->msm_dp_display.connector_type =3D=3D DRM_MODE_CONNECTOR_eDP); dp->hpd_isr_status =3D 0; =20 + mutex_init(&dp->plugged_lock); + rc =3D msm_dp_display_get_io(dp); if (rc) return rc; @@ -1353,7 +1377,7 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *d= rm_bridge, return; } =20 - if (dp->link_ready && !dp->power_on) { + if (!dp->power_on) { msm_dp_display_host_phy_init(msm_dp_display); force_link_train =3D true; } @@ -1398,9 +1422,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bri= dge *drm_bridge, if (dp->is_edp) msm_dp_hpd_unplug_handle(msm_dp_display); =20 - if (!dp->link_ready) - drm_dbg_dp(dp->drm_dev, "type=3D%d is disconnected\n", dp->connector_typ= e); - msm_dp_display_disable(msm_dp_display); =20 drm_dbg_dp(dp->drm_dev, "type=3D%d Done\n", dp->connector_type); @@ -1498,9 +1519,8 @@ void msm_dp_bridge_hpd_notify(struct drm_bridge *brid= ge, =20 hpd_link_status =3D msm_dp_aux_is_link_connected(dp->aux); =20 - drm_dbg_dp(dp->drm_dev, "type=3D%d link hpd_link_status=3D0x%x, link_read= y=3D%d, status=3D%d\n", - msm_dp_display->connector_type, hpd_link_status, - msm_dp_display->link_ready, status); + drm_dbg_dp(dp->drm_dev, "type=3D%d link hpd_link_status=3D0x%x, status=3D= %d\n", + msm_dp_display->connector_type, hpd_link_status, status); =20 if (status =3D=3D connector_status_connected) { if (hpd_link_status =3D=3D ISR_HPD_REPLUG_COUNT) { diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/d= p_display.h index d2d3d61eb0b0..0b65e16c790d 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -17,7 +17,6 @@ struct msm_dp { struct drm_connector *connector; struct drm_bridge *next_bridge; struct drm_bridge *bridge; - bool link_ready; bool audio_enabled; bool power_on; unsigned int connector_type; diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_dr= m.c index f935093c4df4..8dc0dabd275c 100644 --- a/drivers/gpu/drm/msm/dp/dp_drm.c +++ b/drivers/gpu/drm/msm/dp/dp_drm.c @@ -15,36 +15,6 @@ #include "dp_audio.h" #include "dp_drm.h" =20 -static int msm_dp_bridge_atomic_check(struct drm_bridge *bridge, - struct drm_bridge_state *bridge_state, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state) -{ - struct msm_dp *dp; - - dp =3D to_dp_bridge(bridge)->msm_dp_display; - - drm_dbg_dp(dp->drm_dev, "link_ready =3D %s\n", - str_true_false(dp->link_ready)); - - /* - * There is no protection in the DRM framework to check if the display - * pipeline has been already disabled before trying to disable it again. - * Hence if the sink is unplugged, the pipeline gets disabled, but the - * crtc->active is still true. Any attempt to set the mode or manually - * disable this encoder will result in the crash. - * - * TODO: add support for telling the DRM subsystem that the pipeline is - * disabled by the hardware and thus all access to it should be forbidden. - * After that this piece of code can be removed. - */ - if (bridge->ops & DRM_BRIDGE_OP_HPD) - return (dp->link_ready) ? 0 : -ENOTCONN; - - return 0; -} - - /** * msm_dp_bridge_get_modes - callback to add drm modes via drm_mode_probed= _add() * @bridge: Poiner to drm bridge @@ -62,12 +32,10 @@ static int msm_dp_bridge_get_modes(struct drm_bridge *b= ridge, struct drm_connect dp =3D to_dp_bridge(bridge)->msm_dp_display; =20 /* pluggable case assumes EDID is read when HPD */ - if (dp->link_ready) { - rc =3D msm_dp_display_get_modes(dp); - if (rc <=3D 0) { - DRM_ERROR("failed to get DP sink modes, rc=3D%d\n", rc); - return rc; - } + rc =3D msm_dp_display_get_modes(dp); + if (rc <=3D 0) { + DRM_ERROR("failed to get DP sink modes, rc=3D%d\n", rc); + return rc; } else { drm_dbg_dp(connector->dev, "No sink connected\n"); } @@ -92,7 +60,6 @@ static const struct drm_bridge_funcs msm_dp_bridge_ops = =3D { .mode_valid =3D msm_dp_bridge_mode_valid, .get_modes =3D msm_dp_bridge_get_modes, .detect =3D msm_dp_bridge_detect, - .atomic_check =3D msm_dp_bridge_atomic_check, .hpd_enable =3D msm_dp_bridge_hpd_enable, .hpd_disable =3D msm_dp_bridge_hpd_disable, .hpd_notify =3D msm_dp_bridge_hpd_notify, --=20 2.47.3