The patch below does not apply to the 5.4-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@xxxxxxxxxxxxxxx>. 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.4.y git checkout FETCH_HEAD git cherry-pick -x 038e2e2e0150f1649d40f7d915561cdf9e4dd5bf # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061949-woof-dictate-a811@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: 038e2e2e0150 ("drm/amd/display: Set VSC SDP Colorimetry same way for MST and SST") 1abfb9f9c767 ("drm/amd/display: Program VSC SDP colorimetry for all DP sinks >= 1.4") 285a7054bf81 ("drm/amd/display: Remove plane and stream pointers from dc scratch") 02367f529019 ("drm/amd/display: fix a dereference of a NULL pointer") 5daa29473cf6 ("Revert "drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR"") d62d5551dd61 ("drm/amd/display: Backup and restore only on full updates") 2d5bb791e24f ("drm/amd/display: Implement update_planes_and_stream_v3 sequence") d2dea1f14038 ("drm/amd/display: Generalize new minimal transition path") 0701117efd1e ("Revert "drm/amd/display: For FPO and SubVP/DRR configs program vmin/max sel"") a9b1a4f684b3 ("drm/amd/display: Add more checks for exiting idle in DC") dcbf438d4834 ("drm/amd/display: Unify optimize_required flags and VRR adjustments") 9ccfe80d022d ("drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()'") 8457bddc266c ("drm/amd/display: Revert "Rework DC Z10 restore"") 2a8e918f48bd ("drm/amd/display: add power_state and pme_pending flag") e6f82bd44b40 ("drm/amd/display: Rework DC Z10 restore") 012fe0674af0 ("drm/amd/display: Add logging resource checks") a465536ebff8 ("drm/amd/display: revert "Optimize VRR updates to only necessary ones"") 30afdffb3f60 ("drm/amd/display: Fix sending VSC (+ colorimetry) packets for DP/eDP displays without PSR") ca1ecae145b2 ("drm/amd/display: Add null pointer guards where needed") a71e1310a43f ("drm/amd/display: Add more mechanisms for tests") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
