Merge branch 'drm-fixes-4.8' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 12 Aug 2016 04:24:15 +0000 (14:24 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 12 Aug 2016 04:24:15 +0000 (14:24 +1000)
commitc3beef5e14f938070d64a02c762171003018937b
treee1b3ee766287dd1521844f3be36e0a3cf702d027
parent8c065c082ce5722dbb6ed18d6a3128ac9a624362
parentc2a4c5b75a717db8bbe1c2fad6473063a7d2f930
Merge branch 'drm-fixes-4.8' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Some AMD fixes and remove workaround now we have pcieport pm.

* 'drm-fixes-4.8' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: Fix memory trashing if UVD ring test fails
  drm/amdgpu: fix vm init error path
  Revert "drm/radeon: work around lack of upstream ACPI support for D3cold"
  Revert "drm/amdgpu: work around lack of upstream ACPI support for D3cold"