Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 15 Nov 2018 16:14:42 +0000 (02:14 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 15 Nov 2018 16:15:00 +0000 (02:15 +1000)
Fixes for 4.20:
- Fix for huge page handling that caused a GPUVM fault in some cases
- Fix IH ring setup
- Fix for xgmi aperture setup
- Fix for watermark setup for SMU

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181114171853.2866-1-alexander.deucher@amd.com

Trivial merge