Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Browse source

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.

...

This commit is contained in:

Dave Airlie 2015-06-12 10:11:14 +10:00

parent cff100f5d7 ee18e59925

commit 950c37073a

3 changed files with 28 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/gpu/drm/radeon/atombios_crtc.c

View file

15

drivers/gpu/drm/radeon/radeon_device.c

View file

17

drivers/gpu/drm/radeon/radeon_vm.c

View file