[Public]
-----Original Message----- From: Greg Kroah-Hartman gregkh@linuxfoundation.org Sent: Monday, January 6, 2025 10:14 AM To: stable@vger.kernel.org Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org; patches@lists.linux.dev; Shixiong Ou oushixiong@kylinos.cn; Deucher, Alexander Alexander.Deucher@amd.com; Sasha Levin sashal@kernel.org Subject: [PATCH 6.6 014/222] drm/radeon: Delay Connector detecting when HPD singals is unstable
6.6-stable review patch. If anyone has any objections, please let me know.
From: Shixiong Ou oushixiong@kylinos.cn
[ Upstream commit 949658cb9b69ab9d22a42a662b2fdc7085689ed8 ]
In some causes, HPD signals will jitter when plugging in or unplugging HDMI.
Rescheduling the hotplug work for a second when EDID may still be readable but HDP is disconnected, and fixes this issue.
Signed-off-by: Shixiong Ou oushixiong@kylinos.cn Signed-off-by: Alex Deucher alexander.deucher@amd.com Stable-dep-of: 979bfe291b5b ("Revert "drm/radeon: Delay Connector detecting when HPD singals is unstable"")
Please drop both of these patches. There is no need to pull back a patch just so that you can apply the revert.
Thanks,
Alex
Signed-off-by: Sasha Levin sashal@kernel.org
drivers/gpu/drm/radeon/radeon_connectors.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index b84b58926106..cf0114ca59a4 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1267,6 +1267,16 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) goto exit; } }
if (dret && radeon_connector->hpd.hpd != RADEON_HPD_NONE &&
!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) &&
connector->connector_type == DRM_MODE_CONNECTOR_HDMIA) {
DRM_DEBUG_KMS("EDID is readable when HPD
disconnected\n");
schedule_delayed_work(&rdev->hotplug_work,
msecs_to_jiffies(1000));
ret = connector_status_disconnected;
goto exit;
}
if (dret) { radeon_connector->detected_by_load = false; radeon_connector_free_edid(connector);
-- 2.39.5