[pull] radeon drm-next-3.9

[alexdeucher at gmail.com]

From: Alex Deucher <alexander.deucher at amd.com>

Hi Dave,

This is the first drm-next pull for 3.9 for radeon.  Highlights:

- CS ioctl cleanup and unification.  Unification of a lot of functionality
that was duplicated across multiple generates of hardware.
- Add support for Oland GPUs
- Deprecate UMS support.  Mesa and the ddx dropped support for UMS and
apparently very few people still use it since the UMS CS ioctl was broken
for several kernels and no one reported it.  It was fixed in 3.8/stable.
- Rework GPU reset.  Use the status registers to determine what blocks
to reset.  This better matches the recommended reset programming model.
This also allows us to properly reset blocks besides GFX and DMA.
- Switch the VM set page code to use an IB rather than the ring.  This
fixes overflow issues when doing large page table updates using a small
ring like DMA.
- Several small cleanups and bug fixes.

The following changes since commit 3646e4209f2bd0d09022ed792e594fb4f559b86c:

  drm/radeon: switch back to the CP ring for VM PT updates (2013-01-31 16:19:19 -0500)

are available in the git repository at:
  git://people.freedesktop.org/~agd5f/linux drm-next-3.9

Alex Deucher (24):
      drm/radeon: add additional reset flags
      drm/radeon: add a bios scratch asic hung helper
      drm/radeon: rework GPU reset on r6xx/r7xx
      drm/radeon: rework GPU reset on evergreen
      drm/radeon: rework GPU reset on cayman/TN
      drm/radeon: rework GPU reset on cayman/TN
      drm/radeon: use status regs to determine what to reset (6xx/7xx)
      drm/radeon: use status regs to determine what to reset (evergreen)
      drm/radeon: use status regs to determine what to reset (cayman)
      drm/radeon: use status regs to determine what to reset (si)
      drm/radeon: halt engines before disabling MC (6xx/7xx)
      drm/radeon: halt engines before disabling MC (evergreen)
      drm/radeon: halt engines before disabling MC (cayman/TN)
      drm/radeon: halt engines before disabling MC (si)
      drm/radeon: use the reset mask to determine if rings are hung
      drm/radeon: don't reset the MC on IGPs/APUs
      drm/radeon: use IBs for VM page table updates v2
      drm/radeon: switch back to using the DMA ring for VM PT updates
      drm/radeon: add Oland chip family
      drm/radeon: fill in gpu init for Oland
      drm/radeon: add ucode loading support for Oland
      drm/radeon: radeon-asic updates for Oland
      drm/radeon: add Oland pci ids
      drm/radeon/dce6: fix display powergating

Christian König (1):
      drm/radeon: Deprecate UMS support v2

Ilija Hadzic (12):
      drm/radeon: remove unecessary assignment
      drm/radeon: remove unused prototype from radeon_cs
      drm/radeon: fix formatting
      drm/radeon: implement common cs packet parse function
      drm/radeon: use common cs packet parse function
      drm/radeon: factor out cs_next_is_pkt3_nop function
      drm/radeon: refactor vline packet parsing function
      drm/radeon: add a check to wait_reg_mem command
      drm/radeon: rename r100_cs_dump_packet to radeon_cs_dump_packet
      drm/radeon: pull out common next_reloc function
      drm/radeon: use common next_reloc function
      drm/radeon: consolidate redundant macros and constants

Jerome Glisse (1):
      radeon/kms: cleanup async dma packet checking

 drivers/gpu/drm/Kconfig                |    1 +
 drivers/gpu/drm/radeon/Kconfig         |   33 +-
 drivers/gpu/drm/radeon/Makefile        |   10 +-
 drivers/gpu/drm/radeon/atombios_crtc.c |    6 +-
 drivers/gpu/drm/radeon/evergreen.c     |  353 +++++++---
 drivers/gpu/drm/radeon/evergreen_cs.c  | 1149 +++++++++++++-------------------
 drivers/gpu/drm/radeon/evergreen_reg.h |    1 +
 drivers/gpu/drm/radeon/evergreend.h    |   54 +-
 drivers/gpu/drm/radeon/ni.c            |  339 ++++++----
 drivers/gpu/drm/radeon/nid.h           |   27 +-
 drivers/gpu/drm/radeon/r100.c          |  224 ++-----
 drivers/gpu/drm/radeon/r100_track.h    |    4 -
 drivers/gpu/drm/radeon/r100d.h         |   11 -
 drivers/gpu/drm/radeon/r200.c          |   26 +-
 drivers/gpu/drm/radeon/r300.c          |   42 +-
 drivers/gpu/drm/radeon/r300_cmdbuf.c   |    2 +
 drivers/gpu/drm/radeon/r300d.h         |   11 -
 drivers/gpu/drm/radeon/r500_reg.h      |    1 +
 drivers/gpu/drm/radeon/r600.c          |  384 +++++++----
 drivers/gpu/drm/radeon/r600_blit.c     |   33 +-
 drivers/gpu/drm/radeon/r600_blit_kms.c |   31 +
 drivers/gpu/drm/radeon/r600_cp.c       |    2 +
 drivers/gpu/drm/radeon/r600_cs.c       |  332 +++-------
 drivers/gpu/drm/radeon/r600d.h         |   17 +-
 drivers/gpu/drm/radeon/radeon.h        |   31 +-
 drivers/gpu/drm/radeon/radeon_asic.c   |   52 +-
 drivers/gpu/drm/radeon/radeon_asic.h   |   17 +-
 drivers/gpu/drm/radeon/radeon_cp.c     |    2 +
 drivers/gpu/drm/radeon/radeon_cs.c     |  176 +++++-
 drivers/gpu/drm/radeon/radeon_device.c |    1 +
 drivers/gpu/drm/radeon/radeon_drv.c    |   70 +-
 drivers/gpu/drm/radeon/radeon_drv.h    |   16 +-
 drivers/gpu/drm/radeon/radeon_family.h |    1 +
 drivers/gpu/drm/radeon/radeon_gart.c   |   60 +-
 drivers/gpu/drm/radeon/radeon_irq.c    |    2 +
 drivers/gpu/drm/radeon/radeon_mem.c    |    2 +
 drivers/gpu/drm/radeon/radeon_reg.h    |   15 +
 drivers/gpu/drm/radeon/radeon_ring.c   |   19 +
 drivers/gpu/drm/radeon/radeon_state.c  |    2 +
 drivers/gpu/drm/radeon/rv515d.h        |   11 -
 drivers/gpu/drm/radeon/si.c            |  478 ++++++++++----
 drivers/gpu/drm/radeon/sid.h           |   25 +-
 include/drm/drm_pciids.h               |   13 +
 43 files changed, 2199 insertions(+), 1887 deletions(-)