Merge tag 'drm-intel-next-2019-06-19' of git://anongit.freedesktop.org/drm/drm-intel...

Features:
- HDR support (Uma, Ville)
- Add I2C symlink under HDMI connector similar to DP (Oleg)
- Add ICL multi-segmented gamma support (Shashank, Uma)
- Update register whitelist support for new hardware (Robert, John)
- GuC firmware update with updated ABI interface (Michal, Oscar)
- Add support for new DMC header versions (Lucas)
- In-kernel blitter client for selftest use (Matthew)
- Add Mule Creec Canyon (MCC) PCH support to go with EHL (Matt)
- EHL platform feature updates (Matt)
- Use Command Transport Buffers with GuC on all gens (Daniele)
- New i915.force_probe module parameter to replace i915.alpha_support (Jani)

Refactoring:
- Better runtime PM code abstraction/encapsulation (Daniele)
- VBT parsing cleanup and improvements (Jani)
- Move display code to its own subdirectory (Jani)
- Header cleanup (Jani, Daniele)
- Prep work for subsclice mask expansion (Stuart)
- Use uncore mmio register accessors more, remove unused macro wrappers (Tvrtko)
- Remove unused atomic property get/set stubs (Maarten)
- GTT cleanups and improvements (Mika)
- Pass intel_ types instead of drm_ types in plenty of display code (Ville)
- Engine reset, hangcheck, fault code cleanups and improvements (Tvrtko)
- Consider AML variants simply as either KBL or CFL ULX (Ville)
- State checker cleanups and improvements (Ville)
- GEM code reorganization to more files under gem subdirectory (Chris)
- Reducing dependency on a coarse struct_mutex (Chris)

Fixes:
- Fix use of uninitialized/incorrect error pointers (Colin, Dan)
- Fix DSI fastboot on some VLV/CHV platforms (Hans)
- Fix DSI error path (Hans)
- Add ICL port A combo PHY HW state check (Imre)
- Fix ICL AUX-B HW not done issue (Imre)
- Fix perf whitelist on gen10+ (Lionel)
- Fix PSR exit by forcing manual exit on older gens (José)
- Match voltage ranges instead of exact values (Lucas)
- Fix SDVO HDMI audio, with cleanups (Ville)
- Fix plane state dumps (Ville)
- Fix driver cleanup code to support driver hot unbind (Janusz)
- Add checks for ICL memory bandwidth requirements (Ville)
- Fix toggling between no C8 planes vs. at least one C8 plane (Ville)
- Improved checks on PLL usage conditions, refactoring (Ville)
- Avoid clobbering M/N values in fastset fuzzy checks (Ville)
- Take a runtime pm wakeref for atomic commits (Chris)
- Do not allow runtime pm autosuspend to remove userspace GGTT mmaps too quickly (Chris)
- Avoid refcount_inc on known zero count to avoid debug flagging (Chris)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87v9x1lpdh.fsf@intel.com

diff --cc drivers/gpu/drm/i915/display/intel_atomic.c
index ab40448,6b985e8..90ca11a
--- 1/drivers/gpu/drm/i915/intel_atomic.c
--- 2/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@@ -105,11 -105,19 +105,21 @@@ int intel_digital_connector_atomic_set_
        return -EINVAL;
  }
  
+ static bool blob_equal(const struct drm_property_blob *a,
+                      const struct drm_property_blob *b)
+ {
+       if (a && b)
+               return a->length == b->length &&
+                       !memcmp(a->data, b->data, a->length);
+ 
+       return !a == !b;
+ }
+ 
  int intel_digital_connector_atomic_check(struct drm_connector *conn,
 -                                       struct drm_connector_state *new_state)
 +                                       struct drm_atomic_state *state)
  {
 +      struct drm_connector_state *new_state =
 +              drm_atomic_get_new_connector_state(state, conn);
        struct intel_digital_connector_state *new_conn_state =
                to_intel_digital_connector_state(new_state);
        struct drm_connector_state *old_state =

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

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

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

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

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

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

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

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