Ubuntu 20.04 laptop with GeForce RTX 3060 freezing at login screen

CPU: Intel Core i7-1087 x16
Graphics: Intel UHD (CML GT2) + Nvidia GeForce RTX 3060

Ubuntu 20.04.2 LTS
Linux 5.8.0-50-generic x86_64

nvidia-driver-460 installed via the Ubuntu Additional Drivers repository

I can log in and the laptop works as expected with the Intel graphics card selected.
But when I go into NVIDIA X Server Settings and switch from Intel (Power Saving Mode) to NVIDIA (Performance Mode) and reboot, the display always freezes at the login screen.
Then I have to power-down and reboot into recovery mode where I can enter ‘prime-select intel’ and reboot to re-enable logins.

While in recovery mode I ran nvidia-bug-report.sh. The output is here: nvidia-bug-report.log.gz (332.9 KB)

Can anyone suggest what I should to do to get this working properly?

May 05 16:24:46 EEVEE kernel: NVRM: Xid (PCI:0000:01:00): 79, pid=0, GPU has fallen off the bus.

Please check for a bios update. If that doesn’t help, try setting kernel parameter
Does it work with Windows?

I don’t have Windows so I can’t test it on that.
And using Linux to update an Insyde H2O Bios looks a bit too
experimental for me.
However, setting intel_idle.max_cstate=1 does work so I am happy.
Thank you for your help.