Merge drm-upstream/drm-next into drm-misc-next
authorGustavo Padovan <gustavo.padovan@collabora.com>
Wed, 20 Jun 2018 16:22:22 +0000 (13:22 -0300)
committerGustavo Padovan <gustavo.padovan@collabora.com>
Wed, 20 Jun 2018 16:22:22 +0000 (13:22 -0300)
commitd98c71dadc2d0debdb80beb5a478baf1e6f98758
treebf873c28d3acced1814f8b2dba4ae69d2ed77333
parentd67b6a2065076d763c7df626b8c54f16038ad862
parentdaf0678c2036c918f01e4aa6035629d2debc2f30
Merge drm-upstream/drm-next into drm-misc-next

We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
20 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/exynos/exynos_drm_plane.c
drivers/gpu/drm/i2c/tda998x_drv.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_atomic_plane.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_sprite.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
drivers/gpu/drm/tegra/gem.c
drivers/gpu/drm/vc4/vc4_crtc.c
drivers/gpu/drm/vc4/vc4_plane.c
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c