Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 04:40:12 +0000 (14:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Nov 2017 04:40:12 +0000 (14:40 +1000)
Just two small patches for stable to fix the driver failing to load on polaris
cards with harvested VCE or UVD blocks.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: allow harvesting check for Polaris VCE
  drm/amdgpu: return -ENOENT from uvd 6.0 early init for harvesting


Trivial merge