FAILED: patch "[PATCH] drm/amd/display: Avoid flooding unnecessary info messages" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-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-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 9a9c3e1fe5256da14a0a307dff0478f90c55fc8c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025051918-corned-scrounger-ebcc@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 9a9c3e1fe5256da14a0a307dff0478f90c55fc8c Mon Sep 17 00:00:00 2001
From: Wayne Lin <[email protected]>
Date: Tue, 13 May 2025 11:20:24 +0800
Subject: [PATCH] drm/amd/display: Avoid flooding unnecessary info messages
It's expected that we'll encounter temporary exceptions during aux transactions. Adjust logging from drm_info to drm_dbg_dp to prevent flooding with unnecessary log messages.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -3
@@ -107,7 +107,7 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,if (payload.write && result >=0 ) {if (result) {/*one byte indicating partially written bytes*/ -drm_info (adev_to_drm (adev),"amdgpu: AUX partially written\n" ); +drm_dbg_dp (adev_to_drm (adev),"amdgpu: AUX partially written\n" ); result = payload.data[0 ]; }else if (!payload.reply[0 ])/*I2C_ACK|AUX_ACK*/
@@ -133,11 +133,11 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,break ; } -drm_info (adev_to_drm (adev),"amdgpu: DP AUX transfer fail:%d\n" , operation_result); +drm_dbg_dp (adev_to_drm (adev),"amdgpu: DP AUX transfer fail:%d\n" , operation_result); }if (payload.reply[0 ]) -drm_info (adev_to_drm (adev),"amdgpu: AUX reply command not ACK: 0x%02x." , +drm_dbg_dp (adev_to_drm (adev),"amdgpu: AUX reply command not ACK: 0x%02x." , payload.reply[0 ]);return result;