]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jun 2015 00:35:14 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jun 2015 00:35:14 +0000 (17:35 -0700)
commitdf5f4158415b6fc4a2d683c6fdc806be6da176bc
tree29d6190ff653f99a414bba573abe07218cd540cd
parentcff100f5d746465ca40e61cf296321ecf07d3f1c
parent6e2eb00fc5f05c1c6d70e8ccbd9f04c75ea52fbc
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "i915 and radeon fixes:

  i915:
      fix for connector oops regression
      DDC probing fix

  radeon:
      two radeon reverts, along with a freeze workaround and a fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: Make sure radeon_vm_bo_set_addr always unreserves the BO
  Revert "drm/radeon: adjust pll when audio is not enabled"
  Revert "drm/radeon: don't share plls if monitors differ in audio support"
  drm/radeon: fix freeze for laptop with Turks/Thames GPU.
  drm/i915: Fix DDC probe for passive adapters
  drm/i915: Properly initialize SDVO analog connectors