From: Sasha Levin Date: Thu, 20 Feb 2025 19:31:43 +0000 (-0500) Subject: Drop queue-5.4/drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch X-Git-Tag: v6.6.80~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc78f90d978f326ea0cf8398f346952e7b25b280;p=thirdparty%2Fkernel%2Fstable-queue.git Drop queue-5.4/drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch b/queue-5.4/drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch deleted file mode 100644 index cae191ddb2..0000000000 --- a/queue-5.4/drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 666e1960464140cc4bc9203c203097e70b54c95a Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Tue, 5 Nov 2024 14:38:16 +0100 -Subject: drm/rockchip: cdn-dp: Use drm_connector_helper_hpd_irq_event() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Thomas Zimmermann - -commit 666e1960464140cc4bc9203c203097e70b54c95a upstream. - -The code for detecting and updating the connector status in -cdn_dp_pd_event_work() has a number of problems. - -- It does not aquire the locks to call the detect helper and update -the connector status. These are struct drm_mode_config.connection_mutex -and struct drm_mode_config.mutex. - -- It does not use drm_helper_probe_detect(), which helps with the -details of locking and detection. - -- It uses the connector's status field to determine a change to -the connector status. The epoch_counter field is the correct one. The -field signals a change even if the connector status' value did not -change. - -Replace the code with a call to drm_connector_helper_hpd_irq_event(), -which fixes all these problems. - -Signed-off-by: Thomas Zimmermann -Fixes: 81632df69772 ("drm/rockchip: cdn-dp: do not use drm_helper_hpd_irq_event") -Cc: Chris Zhong -Cc: Guenter Roeck -Cc: Sandy Huang -Cc: "Heiko Stübner" -Cc: Andy Yan -Cc: dri-devel@lists.freedesktop.org -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-rockchip@lists.infradead.org -Cc: # v4.11+ -Signed-off-by: Heiko Stuebner -Link: https://patchwork.freedesktop.org/patch/msgid/20241105133848.480407-1-tzimmermann@suse.de -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - ---- a/drivers/gpu/drm/rockchip/cdn-dp-core.c -+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -917,9 +917,6 @@ static void cdn_dp_pd_event_work(struct - { - struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, - event_work); -- struct drm_connector *connector = &dp->connector; -- enum drm_connector_status old_status; -- - int ret; - - mutex_lock(&dp->lock); -@@ -981,11 +978,7 @@ static void cdn_dp_pd_event_work(struct - - out: - mutex_unlock(&dp->lock); -- -- old_status = connector->status; -- connector->status = connector->funcs->detect(connector, false); -- if (old_status != connector->status) -- drm_kms_helper_hotplug_event(dp->drm_dev); -+ drm_connector_helper_hpd_irq_event(&dp->connector); - } - - static int cdn_dp_pd_event(struct notifier_block *nb, diff --git a/queue-5.4/series b/queue-5.4/series index a3656ccb65..83210db7f9 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -109,7 +109,6 @@ leds-lp8860-write-full-eeprom-not-only-half-of-it.patch s390-futex-fix-futex_op_andn-implementation.patch m68k-vga-fix-i-o-defines.patch binfmt_flat-fix-integer-overflow-bug-on-32-bit-systems.patch -drm-rockchip-cdn-dp-use-drm_connector_helper_hpd_irq_event.patch arm64-dts-rockchip-increase-gmac-rx_delay-on-rk3399-puma.patch kvm-explicitly-verify-target-vcpu-is-online-in-kvm_get_vcpu.patch kvm-s390-vsie-fix-some-corner-cases-when-grabbing-vsie-pages.patch