[PULL][Vivid SRU 1/3] Sync drm_atomic and i915_bpo to v4.2-rc6

[Timo Aaltonen]

	Hi

  This is the first pull request of the series as the other two have separate bug reports because they are needed for wily too. I'll send separate pull requests for them for the next SRU cycle.

These commits update i915_bpo to v4.2-rc6, and drm/drm_atomic* almost as far (missing commits that touch other bits).
The top commit of the series is a bugfix that needs to go in with the rest, fixes initial modeset on certain machines.

BugLink: http://bugs.launchpad.net/bugs/1484531

and again, drm_atomic is only used by i915_bpo.



The following changes since commit cfe3276ae623df836262301b4c862e1c681e9a24:

  Fix repeated ipmi_si error message (2015-08-13 09:44:11 -0700)

are available in the git repository at:

  git://kernel.ubuntu.com/tjaalton/ubuntu-vivid.git i915-bpo

for you to fetch changes up to 007b3608664b9903ae15ce316e6ad40b472bd9fc:

  UBUNTU: SAUCE: i915_bpo: drm/i915: Allow parsing of variable size child device entries from VBT, addendum v2 (2015-08-14 19:40:32 +0300)

----------------------------------------------------------------
Andrey Ryabinin (1):
      drm/atomic: fix out of bounds read in for_each_*_in_state helpers

Chris Wilson (4):
      UBUNTU: SAUCE: i915_bpo: drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls
      UBUNTU: SAUCE: i915_bpo: drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop
      UBUNTU: SAUCE: i915_bpo: drm/i915: Mark PIN_USER binding as GLOBAL_BIND without the aliasing ppgtt
      UBUNTU: SAUCE: i915_bpo: drm/i915: Declare the swizzling unknown for L-shaped configurations

Daniel Vetter (4):
      drm/atomic: Extract needs_modeset function
      drm/atomic-helper: Add an atomice best_encoder callback
      drm/atomic-helpers: Make encoder picking more robust
      UBUNTU: SAUCE: i915_bpo: drm/i915: Fixup dp mst encoder selection

David Weinehall (2):
      UBUNTU: SAUCE: i915_bpo: drm/i915: Allow parsing of variable size child device entries from VBT
      UBUNTU: SAUCE: i915_bpo: drm/i915: Allow parsing of variable size child device entries from VBT, addendum v2

Linus Torvalds (1):
      i915: temporary fix for DP MST docking station NULL pointer dereference

Maarten Lankhorst (4):
      drm/atomic: add commit_planes_on_crtc helper
      drm/atomic: add drm_atomic_add_affected_planes
      drm/atomic: add all affected planes in drm_atomic_helper_check_modeset
      drm/atomic: Clear crtc_state->active in drm_atomic_helper_set_config.

 drivers/gpu/drm/drm_atomic.c        | 42 ++++++++++++++++-
 drivers/gpu/drm/drm_atomic_helper.c | 94 ++++++++++++++++++++++++++++++++-----
 include/drm/drm_atomic.h            | 34 +++++++++-----
 include/drm/drm_atomic_helper.h     |  1 +
 include/drm/drm_crtc_helper.h       |  3 ++
 include/uapi/drm/i915_drm.h         |  8 ++++
 ubuntu/i915/i915_drv.h              | 17 ++++---
 ubuntu/i915/i915_gem_gtt.c          | 11 +++++
 ubuntu/i915/i915_gem_tiling.c       |  5 +-
 ubuntu/i915/intel_bios.c            | 32 +++++++++++--
 ubuntu/i915/intel_bios.h            |  4 ++
 ubuntu/i915/intel_dp_mst.c          | 11 +++++
 ubuntu/i915/intel_uncore.c          | 26 +++++++---
 13 files changed, 241 insertions(+), 47 deletions(-)



-- 
t