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 0E0CD30E0F6; Tue, 11 Nov 2025 01:09:08 +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=1762823348; cv=none; b=aMgldcxUHy9eL5kFQ7d5Huv88mR+YiE+zmXdUmATqnjz4QVYfwMOcCuFmNqmnGaRRVAIn7gaJdrH45U7xNmwRgXycHalNPAo0jvueJ842CCh/xgC5kCSb0PxJJyhEo+0/40colPNJjBXiTNdv9K8icZHLYNf2c7ZrCBaHTH533k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762823348; c=relaxed/simple; bh=LVe6LpvkVZtKrqGVrl6MEKS3gdTugDJhXFrQhKXJMoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nsUhYe/vw9UZF6VHHw0FD8oA0Kh+dzpTH5qHrAluVP+RLO9dzr/FDg/94Hrt2kWJ4aYimKyVc7D0AZZBNKm2GluWY3WibARA/dCgXREW/KxzjqFOJ8XDAhixbjqzNge8MFCO/oiyPPgOC0gHUHHOLqkLfNokEJkFsnpvQUhTIF4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=d8XtaSDv; 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="d8XtaSDv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E069C19422; Tue, 11 Nov 2025 01:09:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1762823347; bh=LVe6LpvkVZtKrqGVrl6MEKS3gdTugDJhXFrQhKXJMoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d8XtaSDvgPE9web5ldnqUQazPIIGODUGece8fu+2wzRTPGWLVhY2SZw2+8TQzoKsw VYjNP6IH7fKarChsKy5EOfXbipnTBjVoBr8plkQYWOpxAWOrTesxHRxZgXa3kuQ+d3 9iUpDnIXzP4S+1qIihVlJ/EnMiprnVOiIr4JZYkY= 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 6.12 224/565] drm/bridge: display-connector: dont set OP_DETECT for DisplayPorts Date: Tue, 11 Nov 2025 09:41:20 +0900 Message-ID: <20251111004531.959082908@linuxfoundation.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251111004526.816196597@linuxfoundation.org> References: <20251111004526.816196597@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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 ab8e00baf3f16..e5817f5439144 100644 --- a/drivers/gpu/drm/bridge/display-connector.c +++ b/drivers/gpu/drm/bridge/display-connector.c @@ -363,7 +363,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