[linux-cachyos] Issues on resume from suspend-to-disk with amdgpu

[Doridian]

With the current kernel, I am getting a black screen on resume, see log below:
kern.log

After some digging, it seems the CachyOS kernel already reverts some of the amdgpu patches in 6.14, so I am not sure if this is an upstream issue or CachyOS exclusive.

Either way, reverting a further patch has fixed display on resume. To be precise, reverting this commit: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4aaffc85751da5722e858e4333e8cf0aa4b6c78f

[1Naim]

it seems the CachyOS kernel already reverts some of the amdgpu patches in 6.14 related to suspend

What? where?

[Doridian]

it seems the CachyOS kernel already reverts some of the amdgpu patches in 6.14 related to suspend

What? where?

Turns out I should re-read what I write. I was so in "oh my suspend is broken" mode.
I was referring to this: CachyOS/kernel-patches@d982986
(But of course none of these seem directly related to suspend/resume, my aplogoies)

[1Naim]

Oh that's unrelated. I just reverted a fix that I cherrypicked at an earlier time, since the cherrypick was incomplete (I didn't know this either at the time).

[1Naim]

Can you reproduce this on linux-cachyos-rc too? As much as I'd like to get this fixed, it seems like a pointless endeavour on our part since 6.15.0 is releasing next week and barring any blockers, we will update to that ASAP.

[Doridian]

Can you reproduce this on linux-cachyos-rc too? As much as I'd like to get this fixed, it seems like a pointless endeavour on our part since 6.15.0 is releasing next week and barring any blockers, we will update to that ASAP.

Still repros with linux-cachyos-rc for me

//EDIT: Also filed it upstream now: https://gitlab.freedesktop.org/drm/amd/-/issues/4243

[1Naim]

I see progress has been made https://gitlab.freedesktop.org/drm/amd/-/issues/4155#note_2923984. Can I safely apply this patch for 6.15?

[1Naim]

Or... not? It looks like it doesn't really change anything on top of the revert (which will be in 6.15.0).

[Doridian]

Or... not? It looks like it doesn't really change anything on top of the revert (which will be in 6.15.0).

At least for my hardware, that is correct, yes.