Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/gpu/drm/i915/Kconfig.debug
index 8c7972df9f0fcb13709d8f965f8e9dcb9371f853,80efee1ff7f38e25f1a4f0910e97700c81035445..9de8b1c51a5ccda8f6f7140f90ed4707b40d1da3
--- 1/drivers/gpu/drm/i915/Kconfig.debug
--- 2/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@@ -25,7 -25,8 +25,8 @@@ config DRM_I915_DEBU
          select X86_MSR # used by igt/pm_rpm
          select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
          select DRM_DEBUG_MM if DRM=y
 -      select DRM_DEBUG_MM_SELFTEST
+         select STACKDEPOT if DRM=y # for DRM_DEBUG_MM
 +      select DRM_DEBUG_SELFTEST
        select SW_SYNC # signaling validation framework (igt/syncobj*)
        select DRM_I915_SW_FENCE_DEBUG_OBJECTS
        select DRM_I915_SELFTEST

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

diff --cc drivers/gpu/drm/i915/intel_sprite.c
index 344228b640b9774687f323df232791f72b504276,aa1dfaa692b9def7e2d35082de9e46fb68c9670a..970015dcc6f1be52564126c6263d8dde19e10f98
--- 1/drivers/gpu/drm/i915/intel_sprite.c
--- 2/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@@ -939,7 -946,12 +940,8 @@@ intel_check_sprite_plane(struct intel_p
        int max_scale, min_scale;
        bool can_scale;
        int ret;
+       uint32_t pixel_format = 0;
  
 -      *src = drm_plane_state_src(&state->base);
 -      *dst = drm_plane_state_dest(&state->base);
 -
        if (!fb) {
                state->base.visible = false;
                return 0;

diff --cc drivers/gpu/drm/qxl/qxl_cmd.c
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_drv.h
Simple merge

diff --cc include/drm/drm_dp_helper.h
Simple merge