nvidia-modeset: WARNING: GPU:0: Lost display notification

I have an intermittent issue where I cannot wake up the screens attached to my laptop (Lenovo P51 w/ VIDIA GPU Quadro M2200 (GM206GL-A) and version 384.130 of the drivers). If I log into the machine remotely, I can see that the process nvidia-modeset is using 100% of a cpu. The process is not killable (-1 or -9). The only unusual event in syslog is the event:

kernel: nvidia-modeset: WARNING: GPU:0: Lost display notification (0:0x00000000); continuing

and I don’t know of any recourse but the hard reboot my laptop (shutdown/poweroff hangs forever). I reported this a while back to Debian here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=905309

I am obviously not keen on having to periodically hard reboot my laptop. Any ideas?