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)
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"


Trivial merge