Backmerge tag 'v4.12-rc7' into drm-next

Linux 4.12-rc7

Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/gpu/drm/radeon/cik.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si.c
Simple merge

diff --cc drivers/gpu/drm/tegra/drm.c
Simple merge

diff --cc drivers/gpu/host1x/dev.c
Simple merge