Nvidia 515.48.07 fails to detect laptop display on wake-up from sleep on Arch Linux

Running Arch Linux KDE Plasma with SDDM login on an Oryx Pro Laptop with GeForce RTX3070. Getting this error on wake-up from sleep. System usually freezes until hard reset then boots normally. Otherwise I’ll get a black screen with a single cursor then freeze. Sometimes the login screen will come up after a delay but the system runs remarkably slow. Journal shows the entries below. I’ve tried replacing SDDM with lightdm but same issue. Tried both linux and linux-zen kernels, xorg and wayland. Was working fine before updating to version 515. I’ll probably just downgrade but any ideas would be great.

Jun 14 10:44:45 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed to determine display capabilities
Jun 14 10:44:45 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed to tear down Disp
Jun 14 10:44:45 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed to determine display capabilities
Jun 14 10:44:45 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed to tear down Disp
Jun 14 10:44:49 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed detecting connected display devices
Jun 14 10:44:53 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed detecting connected display devices
Jun 14 10:44:57 archlinux kernel: nvidia-modeset: ERROR: GPU:0: Failed detecting connected display devices