From mboxrd@z Thu Jan 1 00:00:00 1970 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 411023A9DAB for ; Thu, 5 Mar 2026 14:31:10 +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=1772721072; cv=none; b=uTK+Qv38f/Xu7SUZCkjoeBYHpXjGqf8wiVdVqq5nYzhKkzn9tGkEsA7i4FDa3Lf99sGvntPv88cbTbHdeGO3D4Etdt5NC9ta95/O1YrOo/xs05U5dkkj1Rxldo0MUzjxC051uzp6LB8+SWCjLLJ3I0uQaoAgccK0LTZ8dpfq+5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772721072; c=relaxed/simple; bh=R32OdfLUHsQw4ysEiC4sXpcqBoejWjyDNBiNJmZkCVg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oORhx5KKAcGqZhVlxOR3WflzJiy78LdorCwd9XR6oklKkunAEkXLQS2blL7OWjH2XGPi2jPlSrMxodsrqPiZvMyu2rKHdTVWRf8agRliWz59p9/2N4LzVRD3JMtWzfEgRFUVnW56oQwL6Zdm5a/3m0gCw9rZ427CjeWKHHcQXWY= 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=DMr5kg79; 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="DMr5kg79" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 625AFg5v1783424 for ; Thu, 5 Mar 2026 14:31:10 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-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cq1pk2289-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 05 Mar 2026 14:31:10 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5ffc6cb5980so839851137.0 for ; Thu, 05 Mar 2026 06:31:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772721069; x=1773325869; 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=DMr5kg79hIfMKxqZ573/NsDgTtoUK9r2kxXDJhZ24vGuQ6YXDWn1gScYzapC9ubGK7 dZiFFtL619bjMZcYVJVuOVPu7pef4z76QcnCjtmYPUloi+sDsXjHpdVnrj7/sTpVGGga MztVTHzJf5S8/g7TR0l6rlv4w99FdPX++6IX/NposRTm0jfTN6wgvNi5NE8K/LhBk4S6 tGRjWNYboLYiAzzI0r6ss23/KTTX1U7K/yGjUHi0+keOIoifGGKJq1zfTv9UEKvVgYfg wqFwDiyejjlmWx1rieExwMh1NmwW0KfAnlBPUywVLvBUgv4rY4mz3ytzjtEbXAsmxxtW 4KeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772721069; x=1773325869; 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=I3/u78Fq7rGI0lPIv+OUBpK7X+JRyQixQynBvxlRMy0dVfUny12L0/DyVJYzC+ODzo Tma4yJZ1eXuWnDoPBHxRDlLz4hhJB8GI8EJZPu8uN3su+vl+IxRuuyaMDfbnxlrOnH6O 3kEU7AryrV/uVAyoAAp394IzvZyCeMtMaBFXmRWvNq6Ibun7YSQcL/QP4aIi2tAuFqt5 Ut+eo877nRnSJWVCc8Nj86136YsDkvNFxghd595q8L3l2As3gisOYNYQS8mt23XR924B KYTWAcThVP+OQH7GiyA35pt7ZbZ6WxnihpqKD3rgIKJ8zdSIG0v+ZYsvmVq19B+9vgr4 URwg== X-Gm-Message-State: AOJu0YzKY/PujtanhhR59xO3DJ6zg9CSKch6aeyXfNwGf1vCPCe1kxIK Jf9NSNROv+tFYM/gZw64bNUUbLbdN+BP+ZNIfNDlKRYw5Wbo0azLU4+lGAnOIyfLPVCSdog5fdu hIet2jZAzIamLb8M8V63qC2R9zI41YC30DUuIJFwHtlwb7oBxLEN4BUiAaGOfhROuT1Iq X-Gm-Gg: ATEYQzzEmD+Io+sBjDPPfc35EQTwZRcrTsmdElKr958AcyPRXRJQNh/gsLi1cEBPffI XxninT81KuOuiKktWyR0Loe36SPN+9xi7f2jG7k8fuzjzRZk1q+YJkpjtLET/eZQbt9hjoRKd9Q Lcz11SFLLnMBJYkeLgHJHxgbIal/A+gFGTbyKA8z672XVaYvq0FphuFeElmSgeCjWYD4m5vOOmO G7PJ1jmImmVSRIScZcdXXA9EABdWTHaiRFQrdUNbx0IOxVGlTGaXRUpWAVwbQMK31pIyQZf90KF zHMTuuCq444Muo/88mq2GePmQBLOnenI5hf0liwQct+/LV7V46cU8c0TW3+Jv3dame7vq27yHcR Fw3ukhTih1C0MSslqTtVkmwPW17oTOEqA42px7ovVxUV++/nbCormf4qI7U8NWzhfLTql7e6bFs SdE5LyQWfzXlLnuC0B5c/lx6pNjuOxogLRV/Q= X-Received: by 2002:a05:6102:e0a:b0:5ff:a3de:7225 with SMTP id ada2fe7eead31-5ffaacfd745mr2297116137.16.1772721067649; 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-arm-msm@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: <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-Proofpoint-ORIG-GUID: 4zw8aPt-QcKuee3R9Aor1FtGEkry3JP- X-Authority-Analysis: v=2.4 cv=Gu9PO01C c=1 sm=1 tr=0 ts=69a993ae cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=n7_vWGaP1GUJy7dh50EA:9 a=QEXdDO2ut3YA:10 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-GUID: 4zw8aPt-QcKuee3R9Aor1FtGEkry3JP- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA1MDExNiBTYWx0ZWRfX7UM2o93jtOWc rzD7gQVp5wm0b8FW/NDQP5yObnz6caIDw3J8A795hI55xjeUX77z3j4bwJui2GMHCoCqqgMHE/I lxwmP2XqwZ6nfi1glvA2I7HTp04VWTwbZ5aKwf5IJ64N/iVg+5Je91KGYGg+EvjbjZTbkG5a9zW A0F6Y61rdflRQe0ljhEezhJNLbsY1y8P3uHqL0N29WzYxnuEc/eSKAAv/O9nGyXnbc7IkxNf/YW TNok1D6dgl7Qj0GyUywODpycDviA781sNFdwcgff25JOVe25c3gdxnW+QDMnguhS2YEPmiCIZ6n zApxvg/RdV3AEVKV+J8/tuDYUINQegUt9ZxAqz4rerK+xFBKOeG6jE4IiiC71vOjRvlzi5jX/lw H7qL9tFBna2p/tpORhGNcdsN38+lar3g+JaFRl/Ts0FgdZlC+H9b1jzRQNKecIaD4ksGQ4yTII4 uDXUtdy+a5qdAqsSNiA== 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 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 bulkscore=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/dp_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; + struct mutex plugged_lock; + bool plugged; + struct drm_device *drm_dev; struct drm_dp_aux *aux; @@ -284,8 +287,6 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp) dp->panel->dpcd, dp->panel->downstream_ports); - dp->msm_dp_display.link_ready = true; - dp->msm_dp_display.psr_supported = dp->panel->psr_cap.version && psr_enabled; dp->audio_supported = info->has_audio; @@ -303,7 +304,7 @@ static int msm_dp_display_process_hpd_high(struct msm_dp_display_private *dp) return rc; } -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=%d core_init=%d phy_init=%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 = true; + return true; } + + return false; } 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 = dp->link->sink_request; 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; - } - } msm_dp_ctrl_handle_sink_request(dp->ctrl); @@ -392,11 +388,11 @@ 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->msm_dp_display.link_ready) - return 0; + mutex_lock(&dp->plugged_lock); ret = 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_display_private *dp) msm_dp_display_host_phy_init(dp); ret = msm_dp_display_process_hpd_high(dp); - if (ret) { /* link train failed */ - dp->msm_dp_display.link_ready = false; - msm_dp_aux_enable_xfers(dp->aux, false); - pm_runtime_put_sync(&pdev->dev); - } drm_dbg_dp(dp->drm_dev, "After, type=%d sink_count=%d\n", dp->msm_dp_display.connector_type, dp->link->sink_count); - /* uevent will complete connection part */ - return 0; + dp->plugged = true; + + mutex_unlock(&dp->plugged_lock); + + return ret; }; static void msm_dp_display_handle_plugged_change(struct msm_dp *msm_dp_display, @@ -446,8 +440,12 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); - if (!dp->msm_dp_display.link_ready) + mutex_lock(&dp->plugged_lock); + if (!dp->plugged) { + mutex_unlock(&dp->plugged_lock); + return 0; + } /* triggered by irq_hdp with sink_count = 0 */ if (dp->link->sink_count == 0) @@ -463,8 +461,6 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp) dp->panel->dpcd, dp->panel->downstream_ports); - dp->msm_dp_display.link_ready = false; - /* signal the disconnect event early to ensure proper teardown */ msm_dp_display_handle_plugged_change(&dp->msm_dp_display, false); @@ -472,8 +468,12 @@ static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp) dp->msm_dp_display.connector_type, dp->link->sink_count); - /* uevent will complete disconnection part */ - pm_runtime_put_sync(&pdev->dev); + if (dp->plugged) { + pm_runtime_put_sync(&pdev->dev); + dp->plugged = false; + } + mutex_unlock(&dp->plugged_lock); + return 0; } @@ -820,41 +820,49 @@ enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge, int status = connector_status_disconnected; u8 dpcd[DP_RECEIVER_CAP_SIZE]; struct drm_dp_desc desc; + bool phy_deinit; 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; - + mutex_lock(&priv->plugged_lock); ret = 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; } + phy_deinit = msm_dp_display_host_phy_init(priv); + msm_dp_aux_enable_xfers(priv->aux, true); ret = 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 = false; goto end; } ret = drm_dp_read_dpcd_caps(priv->aux, dpcd); if (ret) { DRM_DEBUG_DP("failed to read caps\n"); + priv->plugged = false; goto end; } ret = drm_dp_read_desc(priv->aux, &desc, drm_dp_is_branch(dpcd)); if (ret) { DRM_DEBUG_DP("failed to read desc\n"); + priv->plugged = false; goto end; } status = connector_status_connected; + priv->plugged = true; + if (drm_dp_read_sink_count_cap(connector, dpcd, &desc)) { int sink_count = drm_dp_read_sink_count(priv->aux); @@ -865,7 +873,21 @@ enum drm_connector_status msm_dp_bridge_detect(struct drm_bridge *bridge, } 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; } @@ -1123,6 +1145,8 @@ static int msm_dp_display_probe(struct platform_device *pdev) (dp->msm_dp_display.connector_type == DRM_MODE_CONNECTOR_eDP); dp->hpd_isr_status = 0; + mutex_init(&dp->plugged_lock); + rc = msm_dp_display_get_io(dp); if (rc) return rc; @@ -1353,7 +1377,7 @@ void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, return; } - if (dp->link_ready && !dp->power_on) { + if (!dp->power_on) { msm_dp_display_host_phy_init(msm_dp_display); force_link_train = true; } @@ -1398,9 +1422,6 @@ void msm_dp_bridge_atomic_post_disable(struct drm_bridge *drm_bridge, if (dp->is_edp) msm_dp_hpd_unplug_handle(msm_dp_display); - if (!dp->link_ready) - drm_dbg_dp(dp->drm_dev, "type=%d is disconnected\n", dp->connector_type); - msm_dp_display_disable(msm_dp_display); drm_dbg_dp(dp->drm_dev, "type=%d Done\n", dp->connector_type); @@ -1498,9 +1519,8 @@ void msm_dp_bridge_hpd_notify(struct drm_bridge *bridge, hpd_link_status = msm_dp_aux_is_link_connected(dp->aux); - drm_dbg_dp(dp->drm_dev, "type=%d link hpd_link_status=0x%x, link_ready=%d, status=%d\n", - msm_dp_display->connector_type, hpd_link_status, - msm_dp_display->link_ready, status); + drm_dbg_dp(dp->drm_dev, "type=%d link hpd_link_status=0x%x, status=%d\n", + msm_dp_display->connector_type, hpd_link_status, status); if (status == connector_status_connected) { if (hpd_link_status == ISR_HPD_REPLUG_COUNT) { diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_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_drm.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" -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 = to_dp_bridge(bridge)->msm_dp_display; - - drm_dbg_dp(dp->drm_dev, "link_ready = %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 *bridge, struct drm_connect dp = to_dp_bridge(bridge)->msm_dp_display; /* pluggable case assumes EDID is read when HPD */ - if (dp->link_ready) { - rc = msm_dp_display_get_modes(dp); - if (rc <= 0) { - DRM_ERROR("failed to get DP sink modes, rc=%d\n", rc); - return rc; - } + rc = msm_dp_display_get_modes(dp); + if (rc <= 0) { + DRM_ERROR("failed to get DP sink modes, rc=%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 = { .mode_valid = msm_dp_bridge_mode_valid, .get_modes = msm_dp_bridge_get_modes, .detect = msm_dp_bridge_detect, - .atomic_check = msm_dp_bridge_atomic_check, .hpd_enable = msm_dp_bridge_hpd_enable, .hpd_disable = msm_dp_bridge_hpd_disable, .hpd_notify = msm_dp_bridge_hpd_notify, -- 2.47.3