]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jul 2015 19:11:01 +0000 (12:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jul 2015 19:11:01 +0000 (12:11 -0700)
commit23ff9e19febc816363f0a71fe4d1e5c863c07f9f
tree70b090bd3066300cdec3b05f7db6f473591c1ef3
parentfd56d1d66afce096f643faedfe1505488bdf1edd
parent5eb3e5a5e11d14f9deb2a4b83555443b69ab9940
Merge tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel

Pull drm intel fixes from Daniel Vetter:
 "I delayed my -fixes pull a bit hoping that I could include a fix for
  the dp mst stuff but looks a bit more nasty than that.  So just 3
  other regression fixes, one 4.2 other two cc: stable"

* tag 'drm-intel-fixes-2015-07-31' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Declare the swizzling unknown for L-shaped configurations
  drm/i915: Mark PIN_USER binding as GLOBAL_BIND without the aliasing ppgtt
  drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop