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)
commit9cc06965fc8b7c5592b6a1355dff2623611bfeb3
tree4c8f030835494540580acb6e21c253b1a91a4003
parent96ffbbf936298cad0df289ed1c09052493095b7f
parent32bec2afa525149288e6696079bc85f747fa2138
Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

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