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)
commit5a28747b4a74aebadde81044241a704c0c40893a
treee595351774b0ba4f5ac510da4cacc9666332f8f5
parentbb176f67090ca54869fc1262c913aa69d2ede070
parentd3daa2c7865cbfa830651b11c8ad1df23465b46e
Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

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