Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 25 Oct 2017 19:30:39 +0000 (05:30 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 25 Oct 2017 19:30:39 +0000 (05:30 +1000)
two suspend/resume regression fixes.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/amdgpu: Remove workaround check for UVD6 on APUs
  drm/amd/powerplay: fix uninitialized variable


Trivial merge