Resume almost never works Dell XPS 9370

I'm using the i915kms driver and resuming from suspend almost never
works.  What I get is a blank screen with a rectangle cursor in the top
right, like what the screen looks like for that split second when X11
starts.  It is then stuck and I have to force shutdown with the physical
button.

I am not sure but I feel like this happens more frequently after I've
been running bhyve but I can't guarantee that's actually causally
related.

The only special thing I do that I'm aware of is I turn off my usb when
I suspend and back on when I resume, I don't know if this is possibly
related.

usbconfig list | cut -f 1 -d ':' | xargs -n1 -I'{}' usbconfig '{}' power_save

Any tips on what to do?

/Malcolm