From nobody Thu Apr 9 23:24:44 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 7F127384259 for ; Thu, 5 Mar 2026 14:31:09 +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=1772721071; cv=none; b=paibztkKyS6MJf0IFxfKZa7NBpKTUwPa0Y14Ak0uvB1Y3Bf3T3ya/3fQ4X+OdVCS2rJeKLCHW8rJud0ZOosgArQDdPAK5Hx5p+TDwJgweqr1Dqc+73Ld4uXXHsdA/vElnLO/90HcP+vPmmsYaM1AF6bQIIu2ABteOiuOl3ab6GQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772721071; c=relaxed/simple; bh=R32OdfLUHsQw4ysEiC4sXpcqBoejWjyDNBiNJmZkCVg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jfFfn+hNIqBXj3SkhyhEzBPByMQ1mlpOvf0APEu8REZ5bGIXuLLJKPaSCTl47jKPzatxlOlj+5IkiaCygXCH9zbpL8MJrtBSyr0wTJt7gBBHlUsIniv/maS1R4gNV0sz07b5dUlbIiLnLe6uqIG78S3sT8pcE7IKDxVtjOOv4mA= 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=ZZlPtdgT; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=i/9/XhEu; 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="ZZlPtdgT"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="i/9/XhEu" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 625CNcj7720709 for ; Thu, 5 Mar 2026 14:31:08 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= ld2Ouw92w6/L6Zu9kQQPQe8AQdAbl6wT5lMzyeNx8XI=; b=ZZlPtdgT1jKTbdHS yFlCXwiYqio9mNrNu0W73a8s2yZg1OZjFmqYx6CUcZB+ETIByZmk0yut6hgrYUfr xuRiyQLTJMIqyzoqSV+jVOEW9x8IQkPO2T0lCZO+h9JKUmxBiuFB6k/+jp6WVGI+ dpphcMhPn+qhACHdcMzxX4gDA39p5CmBETskqVt/ktlgFZVgwGm7ohDxAmpFbXOj bMWQOSqSbNmaogK7Oy7hzoiBB0RZCqjBmI9ovQjxfEIEPGx0PKV78Cg9kHlAMivp khhU3fQx2oL8DaylRIGMK1EJ1XuHk1EZO6jWYWH45w3l3gx41D0V2PAC0arQCiRw LsAh1A== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cq9srgcgs-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 05 Mar 2026 14:31:08 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-94dea812b24so10058354241.1 for ; Thu, 05 Mar 2026 06:31:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772721068; x=1773325868; 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=ld2Ouw92w6/L6Zu9kQQPQe8AQdAbl6wT5lMzyeNx8XI=; b=i/9/XhEukuRHgT+lykvDPhuZqgYsp33o155A4mga785iRUPnt4ZILPmS75vYAEMZnG OE5tjheg0tMAiCiKUP0C1qXWjMNQ4GzS7dB0Qu1o2DB5AbwSq0kO1948yqlT0aNIZWeD UpH4/0qpgZ0Uo6nJ8ceRGHdp/WpifUUHjrGn163fsK+WM5i9KTFkoNx6glVqNytEcw5T 4gdQ2Kruc48YroWbqqvi5e+Uj6xNn6NtNiXmdTSf/GTkGyPdM8wNFNp1QiL8/XVVKyQf RMCfqEn0Qj3/PYISdLTDRc3EG7gC66ck/bSsYw3OEKjnYTSwFDPwQOwRPX97wtmDBa/w D3zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772721068; x=1773325868; 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=ld2Ouw92w6/L6Zu9kQQPQe8AQdAbl6wT5lMzyeNx8XI=; b=p2BCiTC6OzMDJ1Fil8oSD44QnvSKa/aamD984W50CJ8XVHdaJlLrO5zh1yM1sjA3Y5 J4O0ggQk5VCpKybfqdV/Po2xeN9C1fP0a8u381REKD9zrCtlrAdcJR7eLPkQaunivnaj +TSgDwh4pzNl10bXXzZAxQ2AlLohdj8c/1/B6Y68gNqGGEEwPSrJDGj+ad+KKVK2pcK4 9jnDD/4woTP607h0xY1yzaq2Czy3aKvrLvOZjQoEt9KquMr7FnYJULiPkgqqm95YxLiX L2yPJ4Hmz8yBQZ3uzJP7c9fM9HB3ySdIDAT6h7t6jQxejKarbKfKpG2pT8bjNSKWW5id NDhQ== X-Forwarded-Encrypted: i=1; AJvYcCVBUKl36r6YdpPMUKUbmtcGKFnkh65S7Xh3zd9xjf5DfxBMFgnujW8iOyYwDwnm8TA+TTZaiqgf/mOT0A4=@vger.kernel.org X-Gm-Message-State: AOJu0Yw59LdNSMbQxT1NUQWLM3Q0Eri5W7ovOi2Ue2MiccF6C3rbDe5E VYcWEVHuvi3SdHWUBk80h08hdxQwdG9hz36LmJdb428a77Neyt/gW9868Jruglf/0/7++blJNze AC9NtVyr9DwIQvVF/wBBbCvsm8KBaiZQGQJTovLqLiLiyf4ivwj+4Rvv59qFAEMdvx7s= X-Gm-Gg: ATEYQzzeE9PdKBKMiFf1yEYWTqHlichFuzqHwYUnnnbaHZrMSoTopTV13GabAFb95aA 5rxjTTIw7HClUbj6DLe0PrsaeBUnnagjkm41gtRzZpwGrKZ1mB15InkkvHonusDOnsEwlXBFFbp MdtHB3E3ysCiardpfe9EChGmY93WaNjUFTQIsh4SkzRZo4bSah5XE7Y3g0j3n3Dv3YRt015eKeT fdVJvgZJ49wt5Cltj3ebu7OGkaKUuT/ZXTSESd8hdvgKAJe24p0W8N/3TflueI9ZzdE1d2Wrkb/ gaIzpmyoUp1E135wxWvGm1EG3adxWrxVojaSAGzD8ghVwb9MvQtZj+UbpLxWBxBRrIPZjNAbK5O bHFdbxWrpjFepYdeEiJsG/6Jbob+FVkttbjzJR/txLtSFfeSpNfCY2wl3DjpUE3FYcTfd2WytqT P117o/TAsEjbm1t1Z4n4EwAiI0ku/8s3Zf53I= X-Received: by 2002:a05:6102:e0a:b0:5ff:a3de:7225 with SMTP id ada2fe7eead31-5ffaacfd745mr2297117137.16.1772721067651; Thu, 05 Mar 2026 06:31:07 -0800 (PST) X-Received: by 2002:a05:6102:e0a:b0:5ff:a3de:7225 with SMTP id ada2fe7eead31-5ffaacfd745mr2297065137.16.1772721065559; Thu, 05 Mar 2026 06:31:05 -0800 (PST) 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-5a126fcf563sm1522618e87.27.2026.03.05.06.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2026 06:31:03 -0800 (PST) From: Dmitry Baryshkov Date: Thu, 05 Mar 2026 16:30:51 +0200 Subject: [PATCH v4 9/9] 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: <20260305-hpd-refactor-v4-9-39c9d1fef321@oss.qualcomm.com> References: <20260305-hpd-refactor-v4-0-39c9d1fef321@oss.qualcomm.com> In-Reply-To: <20260305-hpd-refactor-v4-0-39c9d1fef321@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=R32OdfLUHsQw4ysEiC4sXpcqBoejWjyDNBiNJmZkCVg=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpqZOZQbN5JUhkNPEYzXrMNKSqWRlqvzSYG/AvE knF6myJ2mSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaamTmQAKCRCLPIo+Aiko 1RLbCACbfawTPPRng687TeslLGelMtrhY2VdjaX2+OUQvtLqLRsSiuoM4Xzw5f0Uw6FjtVwwrAq UJns3rfHeBxVNflPIEcdZsVDqpfQTJcAHEvl3/oYVrMj1GnKPSW6B6BhBh7i0FVLB6QyvqjY9wp y6efhJKgop96ABfz6YYOOF0BL9TyfIUgwGVBL1GCYP6USdhlY4JmNTsyE1zysd3myJJppLCqeIm wmeX6ugrwiGlYXk2AjL/d+tbKEwP0vjn1iz533gwEyljpkBAYiPbYQWdFxGCsl928jxoKC8KyNX xXV7XxbYWosQxrJUgf+IVeBc5W1w+lYb3lHppU+0sr8PlUgH X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=a/I9NESF c=1 sm=1 tr=0 ts=69a993ac cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=n7_vWGaP1GUJy7dh50EA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-GUID: TNb5SXG1PoDQeuakvmeY7RhpbWddBfNz X-Proofpoint-ORIG-GUID: TNb5SXG1PoDQeuakvmeY7RhpbWddBfNz X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA1MDExNiBTYWx0ZWRfX8CVLZu12bR8d labJ5ay14JF+fvIXVW/4yj5hQjgRMfwogII1bXv2CkIW0hL5CKcnIb/X4bW6K4LDD9JcNU2BhD3 RWycV+rD7rETPYSQ/fJbSrJ44xKbVgRYDsYX3kAq0di9hJV8c6gz2ASCzuCT6UFr9fz6mZ6SWwz HBpzLZ0kz2jltUeIqOyDHgzCjnG5V8YnW1juHPgv4q4KnIHT1H2gEE7QPwFvaUyGClRziS5wf+z LrT6HOiOfHQ/z26eeRIq+m0HdwohiEamVGrlKMRtzEs3XSFp6fmRKAL023Zk6eG01Y/8c+fpDnD wM8K1LC8qEYHEmcLHBz0FnIl7w3miDdKQM1f/PY7bJ/dmKAVCFUiWoAefdAdZ/xtPzuGMuu8/C1 RbxXwedMislJ27pk2XnwYcCyvHJZBVL/mETcTJrRJWdvOduLMH8u4q5v6ajJ2aKZCffdJevzwIS ywmELHSLXmwmhMLHqdg== 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-05_04,2026-03-04_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603050116 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 a1fb9c62bb0e..4e3664f9e5e5 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