Notebook Operating System and Recovery

I just got an envy x360 and installed Ubuntu. Trying to suspend, I only get a black screen, but the computer is still running (fan is spinning). From what I gathered after some searches and a bit of tinkering, it seems that's caused by the bios not reporting the supported sleep states to the OS correctly.

Here's the output of cat /sys/power/mem_sleep on the envy:

[s2idle]

Compared to this on my other machine which works fine:

s2idle [deep]

There's also this relevant line from dmesg:

ACPI: (supports S0 S4 S5)

Compared to the working machine:

ACPI: (supports S0 S3 S4 S5)

Correct me if I'm wrong, but I assume the laptop does actually support S3, so it does in fact look like a bios issue to me.

Here's some more info that might be relevant:

The specific model is 13-ay0003nc (Ryzen 7 4700U, 16GB ram)

I updated the bios to the latest revision available on the hp website: F.12 Rev.A

The distribution I'm using is Ubuntu 20.04

I tried patching the acpi tables as suggested in various places around the internet, but to no avail. (I'm no expert when it comes to that sort of thing though, so I may have done something wrong...)

I'd much appreciate any kind of fix for this, as it makes the laptop largely unusable for me, which is a shame, since I really like it otherwise...

EDIT: I guess I should mention I'm running kernel version 5.8.3