OSDN Git Service

Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 12 Jun 2015 00:11:14 +0000 (10:11 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 12 Jun 2015 00:11:14 +0000 (10:11 +1000)
commit950c37073aae9c2edbd0ba742fd668b4a355eea3
tree37d846270eaa4efd1624b6066d38c43217f6c677
parentcff100f5d746465ca40e61cf296321ecf07d3f1c
parentee18e599251ed06bf0c8ade7c434a0de311342ca
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Two regression reverts, and two fixes, one for a dpm boot freeze.

* 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/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.