Hi Dave, fixes all around for drm/i915, half stable, half for this merge window.
There's a last minute build warning fix on top that I failed to notice earlier, everything else was pushed earlier.
BR, Jani.
The following changes since commit 3c2993b8c6143d8a5793746a54eba8f86f95240f:
Linux 4.12-rc4 (2017-06-04 16:47:43 -0700)
are available in the git repository at:
git://anongit.freedesktop.org/git/drm-intel tags/drm-intel-fixes-2017-06-08
for you to fetch changes up to ef6c4d75e35345f8f362d6754bcd9a28292a897c:
drm/i915: fix warning for unused variable (2017-06-08 17:09:44 +0300)
---------------------------------------------------------------- drm/i915 fixes for v4.12-rc5
---------------------------------------------------------------- Chris Wilson (4): drm/i915: Short-circuit i915_gem_wait_for_idle() if already idle drm/i915: Hold a wakeref for probing the ring registers drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally drm/i915: Fix logical inversion for gen4 quirking
Imre Deak (1): drm/i915: Prevent the system suspend complete optimization
Jani Nikula (1): drm/i915: fix warning for unused variable
Jon Bloomfield (1): drm/i915: Serialize GTT/Aperture accesses on BXT
Kai Chen (1): drm/i915: Disable decoupled MMIO
Maarten Lankhorst (1): drm/i915: Always recompute watermarks when distrust_bios_wm is set, v2.
Michal Wajdeczko (1): drm/i915/guc: Remove stale comment for q_fail
Nagaraju, Vathsala (1): drm/i915/psr: disable psr2 for resolution greater than 32X20
Ville Syrjälä (3): drm/i915: Workaround VLV/CHV DSI scanline counter hardware fail drm/i915: Restore has_fbc=1 for ILK-M drm/i915: Fix 90/270 rotated coordinates for FBC
drivers/gpu/drm/i915/i915_drv.c | 9 +++ drivers/gpu/drm/i915/i915_drv.h | 10 ++++ drivers/gpu/drm/i915/i915_gem.c | 4 ++ drivers/gpu/drm/i915/i915_gem_gtt.c | 106 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 9 +++ drivers/gpu/drm/i915/intel_engine_cs.c | 20 ++++++- drivers/gpu/drm/i915/intel_fbc.c | 19 +++--- drivers/gpu/drm/i915/intel_pm.c | 9 +++ drivers/gpu/drm/i915/intel_psr.c | 5 +- drivers/gpu/drm/i915/intel_sprite.c | 21 +++++++ drivers/gpu/drm/i915/intel_uc.h | 2 - 13 files changed, 196 insertions(+), 23 deletions(-)