From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Nov 2017 04:40:12 +0000 (+1000)
Subject: Merge branch 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.14-rc8~17^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9cc06965fc8b7c5592b6a1355dff2623611bfeb3;p=users%2Fjedix%2Flinux-maple.git

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

9cc06965fc8b7c5592b6a1355dff2623611bfeb3