If nomodeset works, it implies that the problem is in AMDGPU driver. Since the problem is still found in the latest upstream kernel, it'd be better to report to the upstream devs, e.g. gitlab.freedesktop.org Issues DRM/AMD. (Or search similar entries from there.) Care to do that?