Ubuntu 11.04 X fails on boot

I get a flicker of a screen on boot and then no graphics.
Error in dmesg | grep fb
fb: conflicting fb hw usage inteldrmfb vs EFI VGA – removing generic driver

To get graphics ctrl+alt+F1 and login. Then run “sudo service gdm restart” and I have a full X session. Login as my user and things work well until I reboot again.
I’m having a tough time understanding the fix for this, but I have found some references that state setting the resolution in /etc/default/grub might fix things.
I found a GUI to fix this, “apt-get install startupmanager” and changed the resolution from 640×480 to 800×600 under both the boot options and the advanced tab.
Reboot and I get a GUI that works.