Merged in rockchip/hdmi/fb tweaks from leolas and galland