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

Backmerge to get the EDID handling changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/i915_drv.h
index ac4c3c6,48fd827..2a6e212
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -65,40 -65,26 +65,41 @@@
  #include "intel_uncore.h"
  
  struct drm_i915_clock_gating_funcs;
 -struct drm_i915_gem_object;
 -struct drm_i915_private;
 -struct intel_connector;
 -struct intel_dp;
 -struct intel_encoder;
 -struct intel_limit;
 -struct intel_overlay_error_state;
  struct vlv_s0ix_state;
+ struct intel_pxp;
  
 -#define I915_GEM_GPU_DOMAINS \
 -      (I915_GEM_DOMAIN_RENDER | \
 -       I915_GEM_DOMAIN_SAMPLER | \
 -       I915_GEM_DOMAIN_COMMAND | \
 -       I915_GEM_DOMAIN_INSTRUCTION | \
 -       I915_GEM_DOMAIN_VERTEX)
 +#define GEM_QUIRK_PIN_SWIZZLED_PAGES  BIT(0)
  
 -#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
 +/* Data Stolen Memory (DSM) aka "i915 stolen memory" */
 +struct i915_dsm {
 +      /*
 +       * The start and end of DSM which we can optionally use to create GEM
 +       * objects backed by stolen memory.
 +       *
 +       * Note that usable_size tells us exactly how much of this we are
 +       * actually allowed to use, given that some portion of it is in fact
 +       * reserved for use by hardware functions.
 +       */
 +      struct resource stolen;
  
 -#define GEM_QUIRK_PIN_SWIZZLED_PAGES  BIT(0)
 +      /*
 +       * Reserved portion of DSM.
 +       */
 +      struct resource reserved;
 +
 +      /*
 +       * Total size minus reserved ranges.
 +       *
 +       * DSM is segmented in hardware with different portions offlimits to
 +       * certain functions.
 +       *
 +       * The drm_mm is initialised to the total accessible range, as found
 +       * from the PCI config. On Broadwell+, this is further restricted to
 +       * avoid the first page! The upper end of DSM is reserved for hardware
 +       * functions and similarly removed from the accessible range.
 +       */
 +      resource_size_t usable_size;
 +};
  
  struct i915_suspend_saved_registers {
        u32 saveDSPARB;
@@@ -337,6 -366,10 +338,8 @@@ struct drm_i915_private 
                struct file *mmap_singleton;
        } gem;
  
 -      u8 pch_ssc_use;
 -
+       struct intel_pxp *pxp;
+ 
        /* For i915gm/i945gm vblank irq workaround */
        u8 vblank_enabled;
  

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

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