| commit | 1b22f6d72ab45e0a1912bc7af2efd43e70a5ab59 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri Jun 16 10:00:11 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri Jun 16 10:00:11 2017 +1000 |
| tree | 42a070f1c8294f8714e1e7b817569b88c95da66e | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 [diff] | |
| parent | 55f61a040e1b1ea0ba962e53ae341b4c51915bd1 [diff] |
Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes A few fixes for 4.12: - fix a UVD regression on SI - fix overflow in watermark calcs on large modes * 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux: drm/radeon: Fix overflow of watermark calcs at > 4k resolutions. drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions. drm/radeon: fix "force the UVD DPB into VRAM as well"