Merge commit '4b514e10' into for_srini_4.9_new_drm_msm

This commit was the top of drm-misc repo during one of the
4.9-rc merge cycles. This contains some drm misc commits
that eventually made it to 4.10.

Signed-off-by: Archit Taneja <architt@codeaurora.org>

Conflicts:
	drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
	drivers/gpu/drm/i915/intel_pm.c