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 75CE834FF75; Fri, 21 Nov 2025 13:41:53 +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=1763732513; cv=none; b=d4MCdMJrPo5VN8Tco836LP7tMgrQvEu08SqmmSAAvUzLWSvwEDUh26URATqW9ZQlctkpVmOU3KzVkI3vy2ISmZ27r67C2XDYxiRWwGGEx9uiveUiqElh5gxZ8nioZ3y50Vz1YkgYXbr6sxAGFo6CD4Rb6POehzhHA5Z3wz+qAb0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763732513; c=relaxed/simple; bh=MBslhgRo4Udwj5iuRyDcveGwcLLV67fJLWk/eIAfnh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CTRRWdrSGhK00WsiIuSKsi9zeLZFEwRJvE97nN36oyRkup9p37kH9TC/L/9G7yVBSrlkr5O7ZAb6opM5gQlwO+n2cbgxXvqbbuwn4U78QWWIe2aFhyLOeAwvlbpLxN6J6lfWNYxI581eSGGqvqYA7wMOJ+52yHfU7fzYvffDrvE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2vjXuSQv; 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="2vjXuSQv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC6CC4CEF1; Fri, 21 Nov 2025 13:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763732513; bh=MBslhgRo4Udwj5iuRyDcveGwcLLV67fJLWk/eIAfnh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2vjXuSQv5eft32J3wyCBZ5451ul0KCrWlHy5PTcvh8HK8G2WL0k8O0eE6Zvz9RrJD 7l+NQiNQvhgpbSI6bUy2Ls5PNjv8doPAKQ0iw04wlpKF8/IilSaYYdDgXBF0czFAFS bVKAQ2MhNkV66nXgCtDKcYvx0nAWymrvbmZk8n5w= 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.6 148/529] drm/bridge: display-connector: dont set OP_DETECT for DisplayPorts Date: Fri, 21 Nov 2025 14:07:27 +0100 Message-ID: <20251121130236.286200030@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251121130230.985163914@linuxfoundation.org> References: <20251121130230.985163914@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 6.6-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 08bd5695ddae0..0f3714aae6089 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