[pull] radeon and amdgpu drm-fixes-4.12

[Alex Deucher]

Hi Dave,

A few fixes for 4.12:
- fix a UVD regression on SI
- fix overflow in watermark calcs on large modes

The following changes since commit 6e88007e224ce51969ccf9afeec645146c638816:

  Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes (2017-06-09 13:12:02 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~agd5f/linux drm-fixes-4.12

for you to fetch changes up to 55f61a040e1b1ea0ba962e53ae341b4c51915bd1:

  drm/radeon: Fix overflow of watermark calcs at > 4k resolutions. (2017-06-14 09:25:58 -0400)

----------------------------------------------------------------
Christian König (1):
      drm/radeon: fix "force the UVD DPB into VRAM as well"

Mario Kleiner (2):
      drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions.
      drm/radeon: Fix overflow of watermark calcs at > 4k resolutions.

 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 7 +++++--
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 +++++--
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c  | 7 +++++--
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c  | 7 +++++--
 drivers/gpu/drm/radeon/cik.c           | 7 +++++--
 drivers/gpu/drm/radeon/evergreen.c     | 7 +++++--
 drivers/gpu/drm/radeon/radeon_uvd.c    | 2 +-
 drivers/gpu/drm/radeon/si.c            | 7 +++++--
 8 files changed, 36 insertions(+), 15 deletions(-)