amdgpu: fix panic on old GPUs

Because of incomplete backports to stable kernels, DC ended up breaking on older GCN 1 GPUs. This patchset adds the missing upstream commits to at least fix the panic/black screen on boot.

They are applicable to 6.12, 6.6, and 6.1 as those are the currently supported kernels that 7009e3af0474aca5f64262b3c72fb6e23b232f9b got backported to.

6.1 needs two extra backports for these two commits to be cherry-picked cleanly. Those are

96ce96f8773da4814622fd97e5226915a2c30706
d09ef243035b75a6d403ebfeb7e87fa20d7e25c6

v2: Add Signed-off-by.

Timur Kristóf (2):
drm/amd/display: Add pixel_clock to amd_pp_display_configuration drm/amd/pm: Use pm_display_cfg in legacy DPM (v2)

 .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c  |  1 +
 .../dc/clk_mgr/dce110/dce110_clk_mgr.c        |  2 +-
 .../drm/amd/display/dc/dm_services_types.h    |  2 +-
 drivers/gpu/drm/amd/include/dm_pp_interface.h |  1 +
 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c  | 67 +++++++++++++++++++
 .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h  |  2 +
 drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c    |  4 +-
 .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c    |  6 +-
 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c    | 65 ++++++------------
 .../gpu/drm/amd/pm/powerplay/amd_powerplay.c  | 11 +--
 10 files changed, 101 insertions(+), 60 deletions(-)

--
2.53.0

Quoted 9 lines · Rosen Penev

Because of incomplete backports to stable kernels, DC ended up breaking on older GCN 1 GPUs. This patchset adds the missing upstream commits to at least fix the panic/black screen on boot.

They are applicable to 6.12, 6.6, and 6.1 as those are the currently supported kernels that 7009e3af0474aca5f64262b3c72fb6e23b232f9b got backported to.

Quoted 7 lines

6.1 needs two extra backports for these two commits to be cherry-picked cleanly. Those are

96ce96f8773da4814622fd97e5226915a2c30706
d09ef243035b75a6d403ebfeb7e87fa20d7e25c6

v2: Add Signed-off-by.

Do I need to resend?

Quoted 20 lines

Timur Kristóf (2):
drm/amd/display: Add pixel_clock to amd_pp_display_configuration drm/amd/pm: Use pm_display_cfg in legacy DPM (v2)

 .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c  |  1 +
 .../dc/clk_mgr/dce110/dce110_clk_mgr.c        |  2 +-
 .../drm/amd/display/dc/dm_services_types.h    |  2 +-
 drivers/gpu/drm/amd/include/dm_pp_interface.h |  1 +
 drivers/gpu/drm/amd/pm/amdgpu_dpm_internal.c  | 67 +++++++++++++++++++
 .../gpu/drm/amd/pm/inc/amdgpu_dpm_internal.h  |  2 +
 drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c    |  4 +-
 .../gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c    |  6 +-
 drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c    | 65 ++++++------------
 .../gpu/drm/amd/pm/powerplay/amd_powerplay.c  | 11 +--
 10 files changed, 101 insertions(+), 60 deletions(-)

--
2.53.0

-stable +Greg

Quoted 12 lines · Rosen Penev

Quoted 11 lines · Rosen Penev

Because of incomplete backports to stable kernels, DC ended up breaking on older GCN 1 GPUs. This patchset adds the missing upstream commits to at least fix the panic/black screen on boot.

They are applicable to 6.12, 6.6, and 6.1 as those are the currently supported kernels that 7009e3af0474aca5f64262b3c72fb6e23b232f9b got backported to.

6.1 needs two extra backports for these two commits to be cherry-picked cleanly. Those are

Quoted 6 lines

Quoted 4 lines

96ce96f8773da4814622fd97e5226915a2c30706
d09ef243035b75a6d403ebfeb7e87fa20d7e25c6

v2: Add Signed-off-by.

Do I need to resend?

Well first of all please stop sending those patches at all.

When you want something backported then add the CC: stable tag to the original patch.

If you find that some patch is already upstream which isn't correctly tagged then ping the relevant maintainers if that patch can be backported.

But don't send stuff to the stable list all by yourself.

Regards,
Christian.

Quoted 27 lines · Central European Standard Time Christian König

-stable +Greg

Quoted 12 lines · Rosen Penev

Quoted 11 lines · Rosen Penev

Because of incomplete backports to stable kernels, DC ended up breaking on older GCN 1 GPUs. This patchset adds the missing upstream commits to at least fix the panic/black screen on boot.

They are applicable to 6.12, 6.6, and 6.1 as those are the currently supported kernels that 7009e3af0474aca5f64262b3c72fb6e23b232f9b got backported to.

6.1 needs two extra backports for these two commits to be cherry-picked cleanly. Those are

Quoted 6 lines

Quoted 4 lines

96ce96f8773da4814622fd97e5226915a2c30706
d09ef243035b75a6d403ebfeb7e87fa20d7e25c6

v2: Add Signed-off-by.

Do I need to resend?

Well first of all please stop sending those patches at all.

When you want something backported then add the CC: stable tag to the original patch.

Quoted 7 lines

If you find that some patch is already upstream which isn't correctly tagged then ping the relevant maintainers if that patch can be backported.

But don't send stuff to the stable list all by yourself.

Regards,
Christian.

Hi Everyone,

The patches actually come from a branch of mine:
https://gitlab.freedesktop.org/Venemo/linux/-/commits/v6.12.74_si_dc_fixes

For context:

The crash comes from a patch that I wrote for 6.18 that fixes some issues on the default, non-DC code path, that was backported to stable kernels. DC was not the default code path before Linux 6.19, so I didn't mark the patches that also fix DC for backporting, because I had assumed nobody uses the DC code path on these kernel versions.

After a user reported to me that this causes issues for him with DC on 6.17 and older kernels, I sent a backported series to Greg and Sasha, in an email thread with the subject line "Fixing an amdgpu crash caused by a backported patch". The fixes were backported to 6.17 then.

I assumed that the stable maintainers would backport the fixes to all older kernels that were also affected, but Rosen brought it to my attention that it didn't happen. So I made the backports in the above branch. Rosen then decided to send them to the mailing list.

Quoted 1 line

Hope that helps clear up the situation.

Thanks & best regards,
Timur

Quoted 20 lines

Hi Everyone,

The patches actually come from a branch of mine:
https://gitlab.freedesktop.org/Venemo/linux/-/commits/v6.12.74_si_dc_fixes

For context:

The crash comes from a patch that I wrote for 6.18 that fixes some issues on the default, non-DC code path, that was backported to stable kernels. DC was not the default code path before Linux 6.19, so I didn't mark the patches that also fix DC for backporting, because I had assumed nobody uses the DC code path on these kernel versions.

After a user reported to me that this causes issues for him with DC on 6.17
and older kernels, I sent a backported series to Greg and Sasha, in an email thread with the subject line "Fixing an amdgpu crash caused by a backported patch". The fixes were backported to 6.17 then.

Quoted 7 lines

I assumed that the stable maintainers would backport the fixes to all older
kernels that were also affected, but Rosen brought it to my attention that it didn't happen. So I made the backports in the above branch. Rosen then decided to send them to the mailing list.

Quoted 1 line

Hope that helps clear up the situation.

In theory Harry an Leo should take care of stuff like this

pretty much everybody is overworked.

In that case guys feel free to go ahead and ping the stable maintainers that something is missing.

Just make sure that when a patch passes through your hands that you add a Signed-off-by tag.

Quoted 6 lines · Central European Standard Time Christian König

Quoted 6 lines

Hi Everyone,

The patches actually come from a branch of mine:
https://gitlab.freedesktop.org/Venemo/linux/-/commits/v6.12.74_si_dc_fixes

Quoted 7 lines

Quoted 7 lines

For context:

The crash comes from a patch that I wrote for 6.18 that fixes some issues on the default, non-DC code path, that was backported to stable kernels. DC was not the default code path before Linux 6.19, so I didn't mark the patches that also fix DC for backporting, because I had assumed nobody uses the DC code path on these kernel versions.

Quoted 4 lines

Quoted 4 lines

After a user reported to me that this causes issues for him with DC on 6.17
and older kernels,

Quoted 4 lines

Quoted 4 lines

I sent a backported series to Greg and Sasha, in an
email thread with the subject line "Fixing an amdgpu crash caused by a backported patch". The fixes were backported to 6.17 then.

Quoted 8 lines

Quoted 7 lines

I assumed that the stable maintainers would backport the fixes to all older
kernels that were also affected, but Rosen brought it to my attention that it didn't happen. So I made the backports in the above branch. Rosen then decided to send them to the mailing list.

Quoted 1 line

Hope that helps clear up the situation.

Hi Christian,

Quoted 1 line

In theory Harry an Leo should take care of stuff like this

I don't blame them for this. It is my fault for breaking it in the first place, and I didn't think there was any interest in using DC on older kernels.

Quoted 1 line

pretty much everybody is overworked.

Yeah. We all are.

Quoted 4 lines

In that case guys feel free to go ahead and ping the stable maintainers that something is missing.

Quoted 2 lines

Just make sure that when a patch passes through your hands that you add a Signed-off-by tag.

Thanks! Probably I should have sent the patches myself, then they already would have had all the necessary tags. Sorry for the confusion.

Now that the situation is cleared up, is there anything else we need to do for these two patches here?

Best regards,
Timur

The DC code path just works bettter. So what if suspend is broken. I would much rather a working system. Hyprsunset for example doesn't work without DC. No idea why.

Speaking of suspend, the fixes for it are fairly trivial to backport to 6.12 as well.

Quoted 2 lines

Now that the situation is cleared up, is there anything else we need to do for these two patches here?

Speaking of which, it's probably best to take over here. It's not fun dealing with stable. I also didn't author these patches.

Quoted 3 lines · Central European Standard Time Rosen Penev

The DC code path just works bettter. So what if suspend is broken. I would much rather a working system. Hyprsunset for example doesn't work without DC. No idea why.

It's great that it works better for you. Unfortunately that isn't the case for everyone. It wasn't feature complete until 6.19 so it wasn't a feasible default until then on these GPUs. Since 6.19 I would say it's pretty good now.

Quoted 2 lines

Speaking of suspend, the fixes for it are fairly trivial to backport to 6.12 as well.

Yes. I don't understand why those patches weren't backported. Like I said, I sent them for backporting to 6.17 many months ago and expected to see them backported to older kernels as well.

Quoted 5 lines

Quoted 2 lines

Now that the situation is cleared up, is there anything else we need to do for these two patches here?

Speaking of which, it's probably best to take over here. It's not fun dealing with stable. I also didn't author these patches.

The question was meant for Christian and Greg. What do I need to do to get these patches backported?