Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org...

Baytrail PMIC vs. PMU race fixes from Hans de Goede

This time the right version (v4), with the compile fix.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc drivers/gpu/drm/i915/Kconfig
index 1ae0bb91ee601516e2b98f316167f049163efb51,88e60c9291e4b7383413b2f5ee231cb3f13c93a8..a5cd5dacf055c1ea2cbdf160045bf6bdec4e18ae
--- 1/drivers/gpu/drm/i915/Kconfig
--- 2/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@@ -19,7 -19,7 +19,8 @@@ config DRM_I91
        select INPUT if ACPI
        select ACPI_VIDEO if ACPI
        select ACPI_BUTTON if ACPI
 +      select SYNC_FILE
+       select IOSF_MBI
        help
          Choose this option if you have a system that has "Intel Graphics
          Media Accelerator" or "HD Graphics" integrated graphics,

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

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

diff --cc drivers/gpu/drm/i915/intel_uncore.c
index f1c0da06f8a2fab1f87669dbab55e3959bdde82c,6106a54ecff58fe7041aeae6e0e33f33051fb644..71b9b387ad0494e2cd64897b5953ce69ee1999f4
--- 1/drivers/gpu/drm/i915/intel_uncore.c
--- 2/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@@ -1339,6 -1482,18 +1376,9 @@@ void intel_uncore_init(struct drm_i915_
                break;
        }
  
 -      intel_fw_table_check(dev_priv);
 -      if (INTEL_GEN(dev_priv) >= 8)
 -              intel_shadow_table_check();
 -
 -      if (intel_vgpu_active(dev_priv)) {
 -              ASSIGN_WRITE_MMIO_VFUNCS(vgpu);
 -              ASSIGN_READ_MMIO_VFUNCS(vgpu);
 -      }
 -
+       iosf_mbi_register_pmic_bus_access_notifier(
+               &dev_priv->uncore.pmic_bus_access_nb);
+ 
        i915_check_and_clear_faults(dev_priv);
  }
  #undef ASSIGN_WRITE_MMIO_VFUNCS

diff --cc drivers/i2c/busses/i2c-designware-core.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-core.h
Simple merge