Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>