Backmerge drm-fixes merge into drm-next

Commit '829e3686ebbac5ed0fe0d7f36af1090a0d66a27d' from Linus' tree

The fixes reverts cause a bit of a conflict pain with intel next,
start fixing it up here.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
Simple merge