From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 001D034A3D0; Wed, 3 Dec 2025 16:01:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777664; cv=none; b=qu14Im+qSwiwyQRehqoEakN5L0Vw5FDIHCMYaFN1/fLzy7rnoQG1CCVDf5eCWvhhxbIB0Sg17BfuyJ56Px/IXhkMHshZIQP7urwSSnq5sycLbXbTI+BpM2ug/RA0q6sIumuTaEbXvYeKacthBFVu0vJPViCBc/gOCwOZLw+OQnU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777664; c=relaxed/simple; bh=MlOcCRStL/CrFsnbwShZgg650SSCkFd/FhdGi62x+bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JiM0E0AIWFZ/JGUs9IJ/1EECodjsGx8aK2JxOYut4DUGUV7y5X//1hrLUsX3uOLWa6kNer+I2WuR716QQckJ/93dw4N245Wf1q12aHkGBxLgE5EaHFoQJ011CiuSpGPP1EiHsN1ooU9FdM86Xx1F19KnnKuRAOM32FdJROP9YqQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VHKIl14j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VHKIl14j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EFC4C4CEF5; Wed, 3 Dec 2025 16:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764777663; bh=MlOcCRStL/CrFsnbwShZgg650SSCkFd/FhdGi62x+bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHKIl14jnRkfyg6iCnTm+72teObltbiabEkdTUF3o01b75hMw1S2WfX6oQS8Uxx1B gHfVLDet1ZMc+y/FjATMqALqfAOZMzz7Ehu4LPBurQx8LrAjw0yCHx/D+9JlHI0LU8 mtjAQmq6UHIfoRLwDK/Q2xQOPhIH1TZr3EF8rIxk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org, Laurent Pinchart , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 5.15 108/392] drm/bridge: display-connector: dont set OP_DETECT for DisplayPorts Date: Wed, 3 Dec 2025 16:24:18 +0100 Message-ID: <20251203152418.072806330@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit cb640b2ca54617f4a9d4d6efd5ff2afd6be11f19 ] Detecting the monitor for DisplayPort targets is more complicated than just reading the HPD pin level: it requires reading the DPCD in order to check what kind of device is attached to the port and whether there is an actual display attached. In order to let DRM framework handle such configurations, disable DRM_BRIDGE_OP_DETECT for dp-connector devices, letting the actual DP driver perform detection. This still keeps DRM_BRIDGE_OP_HPD enabled, so it is valid for the bridge to report HPD events. Currently inside the kernel there are only two targets which list hpd-gpios for dp-connector devices: arm64/qcom/qcs6490-rb3gen2 and arm64/qcom/sa8295p-adp. Both should be fine with this change. Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org Acked-by: Laurent Pinchart Link: https://lore.kernel.org/r/20250802-dp-conn-no-detect-v1-1-2748c2b946da@oss.qualcomm.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/display-connector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c index d24f5b90feabf..d8510d9239119 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -351,7 +351,8 @@ static int display_connector_probe(struct platform_device *pdev) if (conn->bridge.ddc) conn->bridge.ops |= DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_DETECT; - if (conn->hpd_gpio) + /* Detecting the monitor requires reading DPCD */ + if (conn->hpd_gpio && type != DRM_MODE_CONNECTOR_DisplayPort) conn->bridge.ops |= DRM_BRIDGE_OP_DETECT; if (conn->hpd_irq >= 0) conn->bridge.ops |= DRM_BRIDGE_OP_HPD; -- 2.51.0