From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 13 Mar 2017 08:26:06 +0000 (+0100)
Subject: Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org... 
X-Git-Tag: v4.13~831^2~28^2~73
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f103560cf7c2abc10283dd0ba9889f3de5b7ac7e;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org/git/drm-intel into drm-intel-next-queued

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>
---

f103560cf7c2abc10283dd0ba9889f3de5b7ac7e
diff --cc drivers/gpu/drm/i915/Kconfig
index 1ae0bb91ee60,88e60c9291e4..a5cd5dacf055
--- a/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/intel_uncore.c
index f1c0da06f8a2,6106a54ecff5..71b9b387ad04
--- a/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