Please consider adding the following commit to v6.1.x:
0e3172bac3f4 ("drm/amdgpu: Don't set struct drm_driver.output_poll_changed")
This fixes a few issues where a system resuming may end up with a black screen if the display topology has changed. It would be great to have it in 6.1 branch.
Alex
