From: Greg Kroah-Hartman Date: Thu, 9 Jan 2025 11:33:01 +0000 (+0100) Subject: drop a drm add/revert pair X-Git-Tag: v5.4.289~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da97be7152a1d96b54d95d70997079a16e0b1ff1;p=thirdparty%2Fkernel%2Fstable-queue.git drop a drm add/revert pair not really needed --- diff --git a/queue-6.6/drm-radeon-delay-connector-detecting-when-hpd-singal.patch b/queue-6.6/drm-radeon-delay-connector-detecting-when-hpd-singal.patch deleted file mode 100644 index 509fdbd2d50..00000000000 --- a/queue-6.6/drm-radeon-delay-connector-detecting-when-hpd-singal.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 20430c3e75a06c4736598de02404f768653d953a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 May 2024 16:57:58 +0800 -Subject: drm/radeon: Delay Connector detecting when HPD singals is unstable - -From: Shixiong Ou - -[ 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 -Signed-off-by: Alex Deucher -Stable-dep-of: 979bfe291b5b ("Revert "drm/radeon: Delay Connector detecting when HPD singals is unstable"") -Signed-off-by: Sasha Levin ---- - 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 - diff --git a/queue-6.6/revert-drm-radeon-delay-connector-detecting-when-hpd.patch b/queue-6.6/revert-drm-radeon-delay-connector-detecting-when-hpd.patch deleted file mode 100644 index 8b3929b3ad9..00000000000 --- a/queue-6.6/revert-drm-radeon-delay-connector-detecting-when-hpd.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ed888cd3d1240ac7f5a6a6324f49f689967a9633 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 14 Nov 2024 16:23:45 -0500 -Subject: Revert "drm/radeon: Delay Connector detecting when HPD singals is - unstable" - -From: Alex Deucher - -[ Upstream commit 979bfe291b5b30a9132c2fd433247e677b24c6aa ] - -This reverts commit 949658cb9b69ab9d22a42a662b2fdc7085689ed8. - -This causes a blank screen on boot. - -Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3696 -Signed-off-by: Alex Deucher -Cc: Shixiong Ou -Cc: stable@vger.kernel.org -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/radeon/radeon_connectors.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c -index cf0114ca59a4..b84b58926106 100644 ---- a/drivers/gpu/drm/radeon/radeon_connectors.c -+++ b/drivers/gpu/drm/radeon/radeon_connectors.c -@@ -1267,16 +1267,6 @@ 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 - diff --git a/queue-6.6/series b/queue-6.6/series index ed0d742907a..d7e7e9e7638 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -11,8 +11,6 @@ smb-client-stop-flooding-dmesg-in-smb2_calc_signatur.patch smb-client-fix-use-after-free-of-signing-key.patch usb-dwc3-gadget-add-missing-check-for-single-port-ra.patch sched-initialize-idle-tasks-only-once.patch -drm-radeon-delay-connector-detecting-when-hpd-singal.patch -revert-drm-radeon-delay-connector-detecting-when-hpd.patch rust-relax-most-deny-level-lints-to-warnings.patch rust-allow-clippy-needless_lifetimes.patch numa-optimize-detection-of-memory-with-no-node-id-as.patch