[Public]

-----Original Message----- From: Sasha Levin sashal@kernel.org Sent: Thursday, January 2, 2025 7:42 PM To: stable-commits@vger.kernel.org; oushixiong@kylinos.cn Cc: Deucher, Alexander Alexander.Deucher@amd.com; Koenig, Christian Christian.Koenig@amd.com; Pan, Xinhui Xinhui.Pan@amd.com; David Airlie airlied@gmail.com; Simona Vetter simona@ffwll.ch Subject: Patch "drm/radeon: Delay Connector detecting when HPD singals is unstable" has been added to the 6.6-stable tree

This is a note to let you know that I've just added the patch titled

drm/radeon: Delay Connector detecting when HPD singals is unstable

to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git%3Ba=su...

The filename of the patch is: drm-radeon-delay-connector-detecting-when-hpd-singal.patch and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let stable@vger.kernel.org know about it.

commit 20430c3e75a06c4736598de02404f768653d953a Author: Shixiong Ou oushixiong@kylinos.cn Date: Thu May 9 16:57:58 2024 +0800

drm/radeon: Delay Connector detecting when HPD singals is unstable

[ 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>

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);