Merge drm/drm-next into drm-intel-next-queued

Backmerging to pull in HDR DP code:

https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.html

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

diff --cc drivers/gpu/drm/i915/Kconfig.debug
index 95d5fb8058fc9cc7a388ee56b4a338c597f4590c,00786a142ff09203b778d9955727ac679ed5e688..eea79125b3ea19432c52488e7352394f86b41dc0
--- 1/drivers/gpu/drm/i915/Kconfig.debug
--- 2/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@@ -1,35 -1,36 +1,36 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_I915_WERROR
 -        bool "Force GCC to throw an error instead of a warning when compiling"
 -        # As this may inadvertently break the build, only allow the user
 -        # to shoot oneself in the foot iff they aim really hard
 -        depends on EXPERT
 -        # We use the dependency on !COMPILE_TEST to not be enabled in
 -        # allmodconfig or allyesconfig configurations
 -        depends on !COMPILE_TEST
 +      bool "Force GCC to throw an error instead of a warning when compiling"
 +      # As this may inadvertently break the build, only allow the user
 +      # to shoot oneself in the foot iff they aim really hard
 +      depends on EXPERT
 +      # We use the dependency on !COMPILE_TEST to not be enabled in
 +      # allmodconfig or allyesconfig configurations
 +      depends on !COMPILE_TEST
        select HEADER_TEST
 -        default n
 -        help
 -          Add -Werror to the build flags for (and only for) i915.ko.
 -          Do not enable this unless you are writing code for the i915.ko module.
 +      default n
 +      help
 +        Add -Werror to the build flags for (and only for) i915.ko.
 +        Do not enable this unless you are writing code for the i915.ko module.
  
 -          Recommended for driver developers only.
 +        Recommended for driver developers only.
  
 -          If in doubt, say "N".
 +        If in doubt, say "N".
  
  config DRM_I915_DEBUG
 -        bool "Enable additional driver debugging"
 -        depends on DRM_I915
 -        select DEBUG_FS
 -        select PREEMPT_COUNT
 -        select REFCOUNT_FULL
 -        select I2C_CHARDEV
 -        select STACKDEPOT
 -        select DRM_DP_AUX_CHARDEV
 -        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
 +      bool "Enable additional driver debugging"
 +      depends on DRM_I915
 +      select DEBUG_FS
 +      select PREEMPT_COUNT
 +      select REFCOUNT_FULL
 +      select I2C_CHARDEV
 +      select STACKDEPOT
 +      select DRM_DP_AUX_CHARDEV
 +      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_SELFTEST
+       select DMABUF_SELFTESTS
        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/Makefile
Simple merge

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

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