tree aec330b6d0692b372f5628ec0011cb9a180b741b
parent e3c3b6e66da1caeb39a504b03ddcdd3693e45254
parent 1d2686d417c5998af3817f93be01745b3db57ecd
author Dave Airlie <airlied@redhat.com> 1584055345 +1000
committer Dave Airlie <airlied@redhat.com> 1584055348 +1000

Merge tag 'amd-drm-fixes-5.6-2020-03-11' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

amd-drm-fixes-5.6-2020-03-11:

amdgpu:
- Update the display watermark bounding box for navi14
- Fix fetching vbios directly from rom on vega20/arcturus
- Navi and renoir watermark fixes

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