[pull] radeon drm-fixes-3.17

[Alex Deucher]

Hi Dave,

More radeon fixes for 3.17.

The following changes since commit c39502c5508fb0106167f80a037c444701faa65f:

  Merge branch 'drm-fixes-3.17' of git://people.freedesktop.org/~agd5f/linux (2014-08-18 23:07:45 +1000)

are available in the git repository at:


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

for you to fetch changes up to b738ca5d68e4051c86e32f46f67a69f3bb9cee5e:

  Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe" (2014-08-19 12:01:50 -0400)

----------------------------------------------------------------
Alex Deucher (6):
      drm/radeon: fix pm handling in radeon_gpu_reset
      drm/radeon: fix display handling in radeon_gpu_reset
      drm/radeon: re-enable selective GPUVM flushing
      drm/radeon: fix active cu count for SI and CIK
      drm/radeon: fix active_cu mask on SI and CIK after re-init (v3)
      Revert "drm/radeon: Use write-combined CPU mappings of ring buffers with PCIe"

Christian König (2):
      drm/radeon: properly document reloc priority mask
      drm/radeon: Sync ME and PFP after CP semaphore waits v4

Michel Dänzer (1):
      drm/radeon: Only flush HDP cache for indirect buffers from userspace

 drivers/gpu/drm/radeon/cik.c              | 34 +++++++++++++++++++++++--------
 drivers/gpu/drm/radeon/cik_sdma.c         |  6 +++---
 drivers/gpu/drm/radeon/evergreen.c        |  4 ++--
 drivers/gpu/drm/radeon/evergreen_dma.c    |  2 +-
 drivers/gpu/drm/radeon/ni.c               |  4 ++--
 drivers/gpu/drm/radeon/r100.c             |  8 ++++----
 drivers/gpu/drm/radeon/r200.c             |  2 +-
 drivers/gpu/drm/radeon/r300.c             |  2 +-
 drivers/gpu/drm/radeon/r420.c             |  4 ++--
 drivers/gpu/drm/radeon/r600.c             | 26 +++++++++++++++++++----
 drivers/gpu/drm/radeon/r600_dma.c         |  6 +++---
 drivers/gpu/drm/radeon/r600d.h            |  1 +
 drivers/gpu/drm/radeon/radeon.h           |  8 +++++---
 drivers/gpu/drm/radeon/radeon_cs.c        |  9 ++++----
 drivers/gpu/drm/radeon/radeon_device.c    | 34 +++++++++++++++++++++++++++++--
 drivers/gpu/drm/radeon/radeon_ib.c        |  5 +++--
 drivers/gpu/drm/radeon/radeon_ring.c      | 20 ++++++++++--------
 drivers/gpu/drm/radeon/radeon_semaphore.c |  2 +-
 drivers/gpu/drm/radeon/radeon_test.c      | 18 ++++++++--------
 drivers/gpu/drm/radeon/radeon_uvd.c       |  2 +-
 drivers/gpu/drm/radeon/radeon_vce.c       |  6 +++---
 drivers/gpu/drm/radeon/radeon_vm.c        | 10 ++++-----
 drivers/gpu/drm/radeon/rv515.c            |  2 +-
 drivers/gpu/drm/radeon/rv770_dma.c        |  2 +-
 drivers/gpu/drm/radeon/si.c               | 15 +++++++-------
 drivers/gpu/drm/radeon/si_dma.c           |  2 +-
 drivers/gpu/drm/radeon/uvd_v1_0.c         |  4 ++--
 include/uapi/drm/radeon_drm.h             |  1 +
 28 files changed, 154 insertions(+), 85 deletions(-)