]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm...
authorDave Airlie <airlied@redhat.com>
Fri, 16 Jun 2017 00:00:11 +0000 (10:00 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 16 Jun 2017 00:00:11 +0000 (10:00 +1000)
commit496af1c7c364fc34e3a0d95f3d54ebdf0474d591
tree42a070f1c8294f8714e1e7b817569b88c95da66e
parentc439244911f15093dc2d91096ca28c8764d4ef54
parent2f6ed5f08e40585f18bbac7f470a1e5e2a3b218d
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"