I need this to be able to apply the deferred fbdev setup patches, I
need the relevant prep work that landed through the drm-intel tree.

Also squash in conflict fixup from Laurent Pinchart.
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>