* FAILED: patch "[PATCH] drm/ast: Use msleep instead of mdelay for edid read" failed to apply to 6.6-stable tree
@ 2025-09-29 11:43 gregkh
2025-09-29 15:50 ` [PATCH 6.6.y] drm/ast: Use msleep instead of mdelay for edid read Sasha Levin
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2025-09-29 11:43 UTC (permalink / raw)
To: nirmoyd, airlied, jfalempe, kuohsiang_chou, csoto, stable,
tzimmermann
Cc: stable
The patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025092920-backspin-glade-7b6c@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97 Mon Sep 17 00:00:00 2001
From: Nirmoy Das <nirmoyd@nvidia.com>
Date: Wed, 17 Sep 2025 12:43:46 -0700
Subject: [PATCH] drm/ast: Use msleep instead of mdelay for edid read
The busy-waiting in `mdelay()` can cause CPU stalls and kernel timeouts
during boot.
Signed-off-by: Nirmoy Das <nirmoyd@nvidia.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Carol L Soto csoto@nvidia.com<mailto:csoto@nvidia.com>
Fixes: 594e9c04b586 ("drm/ast: Create the driver for ASPEED proprietory Display-Port")
Cc: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.19+
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250917194346.2905522-1-nirmoyd@nvidia.com
diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
index 19c04687b0fe..8e650a02c528 100644
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -134,7 +134,7 @@ static int ast_astdp_read_edid_block(void *data, u8 *buf, unsigned int block, si
* 3. The Delays are often longer a lot when system resume from S3/S4.
*/
if (j)
- mdelay(j + 1);
+ msleep(j + 1);
/* Wait for EDID offset to show up in mirror register */
vgacrd7 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd7);
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 6.6.y] drm/ast: Use msleep instead of mdelay for edid read
2025-09-29 11:43 FAILED: patch "[PATCH] drm/ast: Use msleep instead of mdelay for edid read" failed to apply to 6.6-stable tree gregkh
@ 2025-09-29 15:50 ` Sasha Levin
2025-09-30 11:08 ` Patch "drm/ast: Use msleep instead of mdelay for edid read" has been added to the 6.6-stable tree gregkh
0 siblings, 1 reply; 3+ messages in thread
From: Sasha Levin @ 2025-09-29 15:50 UTC (permalink / raw)
To: stable
Cc: Nirmoy Das, Thomas Zimmermann, csoto, KuoHsiang Chou, Dave Airlie,
Jocelyn Falempe, dri-devel, Sasha Levin
From: Nirmoy Das <nirmoyd@nvidia.com>
[ Upstream commit c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97 ]
The busy-waiting in `mdelay()` can cause CPU stalls and kernel timeouts
during boot.
Signed-off-by: Nirmoy Das <nirmoyd@nvidia.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Carol L Soto csoto@nvidia.com<mailto:csoto@nvidia.com>
Fixes: 594e9c04b586 ("drm/ast: Create the driver for ASPEED proprietory Display-Port")
Cc: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.19+
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250917194346.2905522-1-nirmoyd@nvidia.com
[ Applied change to ast_astdp_read_edid() instead of ast_astdp_read_edid_block() ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/ast/ast_dp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ast/ast_dp.c b/drivers/gpu/drm/ast/ast_dp.c
index c6f226b6f0813..fc9c36c8b81b9 100644
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -62,7 +62,7 @@ int ast_astdp_read_edid(struct drm_device *dev, u8 *ediddata)
* of right-click of mouse.
* 2. The Delays are often longer a lot when system resume from S3/S4.
*/
- mdelay(j+1);
+ msleep(j + 1);
if (!(ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xD1,
ASTDP_MCU_FW_EXECUTING) &&
--
2.51.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Patch "drm/ast: Use msleep instead of mdelay for edid read" has been added to the 6.6-stable tree
2025-09-29 15:50 ` [PATCH 6.6.y] drm/ast: Use msleep instead of mdelay for edid read Sasha Levin
@ 2025-09-30 11:08 ` gregkh
0 siblings, 0 replies; 3+ messages in thread
From: gregkh @ 2025-09-30 11:08 UTC (permalink / raw)
To: airlied, csoto, dri-devel, gregkh, jfalempe, kuohsiang_chou,
nirmoyd, sashal, tzimmermann
Cc: stable-commits
This is a note to let you know that I've just added the patch titled
drm/ast: Use msleep instead of mdelay for edid read
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-ast-use-msleep-instead-of-mdelay-for-edid-read.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.
From stable+bounces-181948-greg=kroah.com@vger.kernel.org Mon Sep 29 17:51:18 2025
From: Sasha Levin <sashal@kernel.org>
Date: Mon, 29 Sep 2025 11:50:10 -0400
Subject: drm/ast: Use msleep instead of mdelay for edid read
To: stable@vger.kernel.org
Cc: Nirmoy Das <nirmoyd@nvidia.com>, Thomas Zimmermann <tzimmermann@suse.de>, csoto@nvidia.com, KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>, Dave Airlie <airlied@redhat.com>, Jocelyn Falempe <jfalempe@redhat.com>, dri-devel@lists.freedesktop.org, Sasha Levin <sashal@kernel.org>
Message-ID: <20250929155031.137825-1-sashal@kernel.org>
From: Nirmoy Das <nirmoyd@nvidia.com>
[ Upstream commit c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97 ]
The busy-waiting in `mdelay()` can cause CPU stalls and kernel timeouts
during boot.
Signed-off-by: Nirmoy Das <nirmoyd@nvidia.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Carol L Soto csoto@nvidia.com<mailto:csoto@nvidia.com>
Fixes: 594e9c04b586 ("drm/ast: Create the driver for ASPEED proprietory Display-Port")
Cc: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v5.19+
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250917194346.2905522-1-nirmoyd@nvidia.com
[ Applied change to ast_astdp_read_edid() instead of ast_astdp_read_edid_block() ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/gpu/drm/ast/ast_dp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/ast/ast_dp.c
+++ b/drivers/gpu/drm/ast/ast_dp.c
@@ -62,7 +62,7 @@ int ast_astdp_read_edid(struct drm_devic
* of right-click of mouse.
* 2. The Delays are often longer a lot when system resume from S3/S4.
*/
- mdelay(j+1);
+ msleep(j + 1);
if (!(ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xD1,
ASTDP_MCU_FW_EXECUTING) &&
Patches currently in stable-queue which might be from sashal@kernel.org are
queue-6.6/smb-client-fix-wrong-index-reference-in-smb2_compoun.patch
queue-6.6/gpiolib-extend-software-node-support-to-support-secondary-software-nodes.patch
queue-6.6/net-dsa-lantiq_gswip-suppress-einval-errors-for-brid.patch
queue-6.6/scsi-ufs-mcq-fix-memory-allocation-checks-for-sqe-an.patch
queue-6.6/hid-multitouch-specify-that-apple-touch-bar-is-direc.patch
queue-6.6/can-mcba_usb-populate-ndo_change_mtu-to-prevent-buff.patch
queue-6.6/hid-multitouch-take-cls-maxcontacts-into-account-for.patch
queue-6.6/hid-multitouch-get-the-contact-id-from-hid_dg_transd.patch
queue-6.6/alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch
queue-6.6/cpufreq-initialize-cpufreq-based-invariance-before-s.patch
queue-6.6/ethernet-rvu-af-remove-slash-from-the-driver-name.patch
queue-6.6/bluetooth-hci_sync-fix-hci_resume_advertising_sync.patch
queue-6.6/alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch
queue-6.6/alsa-usb-audio-fix-build-with-config_input-n.patch
queue-6.6/drm-ast-use-msleep-instead-of-mdelay-for-edid-read.patch
queue-6.6/smb-server-don-t-use-delayed_work-for-post_recv_cred.patch
queue-6.6/drm-gma500-fix-null-dereference-in-hdmi-teardown.patch
queue-6.6/s390-cpum_cf-fix-uninitialized-warning-after-backport-of-ce971233242b.patch
queue-6.6/xfrm-xfrm_alloc_spi-shouldn-t-use-0-as-spi.patch
queue-6.6/mm-folio_may_be_lru_cached-unless-folio_test_large.patch
queue-6.6/i40e-increase-max-descriptors-for-xl710.patch
queue-6.6/can-etas_es58x-populate-ndo_change_mtu-to-prevent-bu.patch
queue-6.6/alsa-usb-audio-remove-unneeded-wmb-in-mixer_quirks.patch
queue-6.6/selftests-fib_nexthops-fix-creation-of-non-fdb-nexth.patch
queue-6.6/alsa-usb-audio-move-mixer_quirks-min_mute-into-commo.patch
queue-6.6/mm-gup-revert-mm-gup-fix-infinite-loop-within-__get_.patch
queue-6.6/hid-multitouch-support-getting-the-tip-state-from-hi.patch
queue-6.6/bpf-reject-bpf_timer-for-preempt_rt.patch
queue-6.6/alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-.patch
queue-6.6/mm-gup-check-ref_count-instead-of-lru-before-migrati.patch
queue-6.6/can-hi311x-populate-ndo_change_mtu-to-prevent-buffer.patch
queue-6.6/alsa-usb-audio-simplify-null-comparison-in-mixer_qui.patch
queue-6.6/can-peak_usb-fix-shift-out-of-bounds-issue.patch
queue-6.6/i40e-add-validation-for-ring_len-param.patch
queue-6.6/net-allow-alloc_skb_with_frags-to-use-max_skb_frags.patch
queue-6.6/arm-dts-kirkwood-fix-sound-dai-cells-for-openrd-clie.patch
queue-6.6/firewire-core-fix-overlooked-update-of-subsystem-abi.patch
queue-6.6/net-dsa-lantiq_gswip-do-also-enable-or-disable-cpu-p.patch
queue-6.6/bluetooth-hci_event-fix-uaf-in-hci_acl_create_conn_s.patch
queue-6.6/alsa-usb-audio-convert-comma-to-semicolon.patch
queue-6.6/ib-mlx5-fix-obj_type-mismatch-for-srq-event-subscrip.patch
queue-6.6/can-rcar_can-rcar_can_resume-fix-s2ram-with-psci.patch
queue-6.6/net-dsa-lantiq_gswip-move-gswip_add_single_port_br-c.patch
queue-6.6/i2c-designware-add-quirk-for-intel-xe.patch
queue-6.6/alsa-usb-audio-add-dsd-support-for-comtrue-usb-audio.patch
queue-6.6/arm64-dts-imx8mp-correct-thermal-sensor-index.patch
queue-6.6/mmc-sdhci-cadence-add-mobileye-eyeq-support.patch
queue-6.6/nexthop-forbid-fdb-status-change-while-nexthop-is-in.patch
queue-6.6/alsa-usb-audio-add-mixer-quirk-for-sony-dualsense-ps.patch
queue-6.6/mm-gup-local-lru_add_drain-to-avoid-lru_add_drain_al.patch
queue-6.6/futex-prevent-use-after-free-during-requeue-pi.patch
queue-6.6/usb-core-add-0x-prefix-to-quirks-debug-output.patch
queue-6.6/bnxt_en-correct-offset-handling-for-ipv6-destination.patch
queue-6.6/mm-add-folio_expected_ref_count-for-reference-count-.patch
queue-6.6/wifi-virt_wifi-fix-page-fault-on-connect.patch
queue-6.6/alsa-usb-audio-drop-unnecessary-parentheses-in-mixer.patch
queue-6.6/vhost-take-a-reference-on-the-task-in-struct-vhost_t.patch
queue-6.6/can-sun4i_can-populate-ndo_change_mtu-to-prevent-buf.patch
queue-6.6/octeontx2-pf-fix-potential-use-after-free-in-otx2_tc.patch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-30 11:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-29 11:43 FAILED: patch "[PATCH] drm/ast: Use msleep instead of mdelay for edid read" failed to apply to 6.6-stable tree gregkh
2025-09-29 15:50 ` [PATCH 6.6.y] drm/ast: Use msleep instead of mdelay for edid read Sasha Levin
2025-09-30 11:08 ` Patch "drm/ast: Use msleep instead of mdelay for edid read" has been added to the 6.6-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.