Wanted to make sure a few things were clear from my last message:

"I tested again and I still get the gpu lockup without these options (this is
without having any commit reverted)."
- Since I was not getting a lockup under either of the cmdline options, I went
back and made sure I could still easily trigger the lockup with no command line
options. I was able to trigger the lockup with no command line options.

The systemd hook:
- This hook is not related to any regression to my knowledge as I've used it
since shortly after I got this laptop, so all of my testing has always had this
suspend hook.