tree 778dffa61d1195fa1cad4f59153db5df5d319539
parent 7b74026d9c4ee0cfc5b24e51b7f8d5771bdef1f8
parent c1a17777eb45d9f3821f35e9869c0a08cd2e664e
author Dave Airlie <airlied@redhat.com> 1542298482 +1000
committer Dave Airlie <airlied@redhat.com> 1542298500 +1000

Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

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