There used to be other fixes in this patch but they've slowly disappeared as
other parts have been fixed.
Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>