FAILED: patch "[PATCH] drm/ast: Use msleep instead of mdelay for edid read" failed to apply to 6.1-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.1-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 <[email protected]>.
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.1.y
git checkout FETCH_HEAD
git cherry-pick -x c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025092921-consensus-mystified-6396@gregkh' --subject-prefix 'PATCH 6.1.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 <[email protected]>
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.
drivers/gpu/drm/ast/ast_dp.c +1 -1
@@ -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 );
Sasha Levin
maintainerPATCH 1/1 drm/ast: Use msleep instead of mdelay for edid read
From: Nirmoy Das <[email protected]>
[ Upstream commit c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97 ]
The busy-waiting in mdelay() can cause CPU stalls and kernel timeouts during boot.
--- drivers/gpu/drm/ast/ast_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_dp.c +1 -1
@@ -51,7 +51,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) &&
Signature · 1 line
2.51.0
Patch "drm/ast: Use msleep instead of mdelay for edid read" has been added to the 6.1-stable tree
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.1-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.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Mon Sep 29 17:54:28 2025
From: Sasha Levin <[email protected]>
Date: Mon, 29 Sep 2025 11:54:09 -0400
Subject: drm/ast: Use msleep instead of mdelay for edid read
To: [email protected]
Cc: Nirmoy Das <[email protected]>, Thomas Zimmermann <[email protected]>, KuoHsiang Chou <[email protected]>, Dave Airlie <[email protected]>, Jocelyn Falempe <[email protected]>, [email protected], Sasha Levin <[email protected]>
Message-ID: <[email protected]>
From: Nirmoy Das <[email protected]>
[ Upstream commit c7c31f8dc54aa3c9b2c994b5f1ff7e740a654e97 ]
The busy-waiting in mdelay() can cause CPU stalls and kernel timeouts during boot.
--- drivers/gpu/drm/ast/ast_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_dp.c +1 -1
@@ -51,7 +51,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 [email protected] are
queue-6.1/net-dsa-lantiq_gswip-suppress-einval-errors-for-brid.patch queue-6.1/hid-multitouch-specify-that-apple-touch-bar-is-direc.patch queue-6.1/minmax-add-a-few-more-min_t-max_t-users.patch queue-6.1/can-etas_es58x-sort-the-includes-by-alphabetic-order.patch queue-6.1/can-mcba_usb-populate-ndo_change_mtu-to-prevent-buff.patch queue-6.1/hid-multitouch-take-cls-maxcontacts-into-account-for.patch queue-6.1/hid-multitouch-get-the-contact-id-from-hid_dg_transd.patch queue-6.1/alsa-usb-audio-avoid-multiple-assignments-in-mixer_q.patch queue-6.1/cpufreq-initialize-cpufreq-based-invariance-before-s.patch queue-6.1/ethernet-rvu-af-remove-slash-from-the-driver-name.patch queue-6.1/bluetooth-hci_sync-fix-hci_resume_advertising_sync.patch queue-6.1/alsa-usb-audio-fix-block-comments-in-mixer_quirks.patch queue-6.1/alsa-usb-audio-fix-build-with-config_input-n.patch queue-6.1/minmax-fix-indentation-of-__cmp_once-and-__clamp_once.patch queue-6.1/drm-ast-use-msleep-instead-of-mdelay-for-edid-read.patch queue-6.1/smb-server-don-t-use-delayed_work-for-post_recv_cred.patch queue-6.1/drm-gma500-fix-null-dereference-in-hdmi-teardown.patch queue-6.1/s390-cpum_cf-fix-uninitialized-warning-after-backport-of-ce971233242b.patch queue-6.1/mm-folio_may_be_lru_cached-unless-folio_test_large.patch queue-6.1/i40e-increase-max-descriptors-for-xl710.patch queue-6.1/minmax-add-in_range-macro.patch queue-6.1/can-etas_es58x-populate-ndo_change_mtu-to-prevent-bu.patch queue-6.1/alsa-usb-audio-remove-unneeded-wmb-in-mixer_quirks.patch queue-6.1/selftests-fib_nexthops-fix-creation-of-non-fdb-nexth.patch queue-6.1/alsa-usb-audio-move-mixer_quirks-min_mute-into-commo.patch queue-6.1/mm-gup-revert-mm-gup-fix-infinite-loop-within-__get_.patch queue-6.1/hid-multitouch-support-getting-the-tip-state-from-hi.patch queue-6.1/bpf-reject-bpf_timer-for-preempt_rt.patch queue-6.1/alsa-usb-audio-add-mute-tlv-for-playback-volumes-on-.patch queue-6.1/minmax-deduplicate-__unconst_integer_typeof.patch queue-6.1/mm-gup-check-ref_count-instead-of-lru-before-migrati.patch queue-6.1/can-hi311x-populate-ndo_change_mtu-to-prevent-buffer.patch queue-6.1/minmax-simplify-and-clarify-min_t-max_t-implementation.patch queue-6.1/alsa-usb-audio-simplify-null-comparison-in-mixer_qui.patch queue-6.1/i40e-fix-idx-validation-in-config-queues-msg.patch queue-6.1/can-peak_usb-fix-shift-out-of-bounds-issue.patch queue-6.1/i40e-add-validation-for-ring_len-param.patch queue-6.1/minmax-avoid-overly-complicated-constant-expressions-in-vm-code.patch queue-6.1/net-dsa-lantiq_gswip-do-also-enable-or-disable-cpu-p.patch queue-6.1/bluetooth-hci_event-fix-uaf-in-hci_acl_create_conn_s.patch queue-6.1/alsa-usb-audio-convert-comma-to-semicolon.patch queue-6.1/ib-mlx5-fix-obj_type-mismatch-for-srq-event-subscrip.patch queue-6.1/kmsan-fix-out-of-bounds-access-to-shadow-memory.patch queue-6.1/can-rcar_can-rcar_can_resume-fix-s2ram-with-psci.patch queue-6.1/net-dsa-lantiq_gswip-move-gswip_add_single_port_br-c.patch queue-6.1/alsa-usb-audio-add-dsd-support-for-comtrue-usb-audio.patch queue-6.1/arm64-dts-imx8mp-correct-thermal-sensor-index.patch queue-6.1/nexthop-forbid-fdb-status-change-while-nexthop-is-in.patch queue-6.1/i40e-fix-validation-of-vf-state-in-get-resources.patch queue-6.1/alsa-usb-audio-add-mixer-quirk-for-sony-dualsense-ps.patch queue-6.1/minmax-introduce-min-max-_array.patch queue-6.1/mm-gup-local-lru_add_drain-to-avoid-lru_add_drain_al.patch queue-6.1/futex-prevent-use-after-free-during-requeue-pi.patch queue-6.1/usb-core-add-0x-prefix-to-quirks-debug-output.patch queue-6.1/bnxt_en-correct-offset-handling-for-ipv6-destination.patch queue-6.1/mm-add-folio_expected_ref_count-for-reference-count-.patch queue-6.1/alsa-usb-audio-drop-unnecessary-parentheses-in-mixer.patch queue-6.1/can-sun4i_can-populate-ndo_change_mtu-to-prevent-buf.patch queue-6.1/octeontx2-pf-fix-potential-use-after-free-in-otx2_tc.patch