This reverts commit 51056723.

I somehow managed to combine a patch from Tomas Elf with a totally
unrelated commit message from Chris Wilson. Let's revert this and
reapply properly.
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>