From: Dave Airlie Date: Fri, 16 Jun 2017 00:00:11 +0000 (+1000) Subject: Merge branch 'drm-fixes-4.12' of git://people.freedesktop.org/~agd5f/linux into drm... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1b22f6d72ab45e0a1912bc7af2efd43e70a5ab59;p=openwrt%2Fstaging%2Fblogic.git 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" --- 1b22f6d72ab45e0a1912bc7af2efd43e70a5ab59