[pull] radeon drm-next-3.18

[Alex Deucher]

Hi Dave,

Just some fixes for 3.18.  These are all pretty non-invasive.
- Re-enable some dpm features that were previously disabled due
  to a bug that was fixed in 3.16
- Make some arrays static
- re-arrange some audio code to properly reflect connected status
  in the audio driver

The following changes since commit d743ecf360637d489a3ba81a268f574359149601:

  drm/doc: Fixup drm_irq kerneldoc includes. (2014-09-24 11:43:47 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~agd5f/linux drm-next-3.18

for you to fetch changes up to 483556f4b3fd3af627bb23b259f23ef427226ca0:

  drm/radeon/combios: declare legacy_connector_convert as static (2014-09-24 16:46:41 -0400)

----------------------------------------------------------------
Alex Deucher (10):
      drm/radeon: fix register name to match internal name
      drm/radeon: consolidate duplicate encode is digital function
      drm/radeon: consolidate r600_audio.c into r600_hdmi.c
      drm/radeon: split audio enable between eg and r600 (v2)
      drm/radeon: disable audio when we disable hdmi (v2)
      drm/radeon/dpm: drop clk/voltage dependency filters for NI
      drm/radeon/dpm: drop clk/voltage dependency filters for SI
      drm/radeon/dpm: drop clk/voltage dependency filters for CI
      drm/radeon/dpm: drop clk/voltage dependency filters for BTC
      drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table

Michele Curti (2):
      drm/radeon/atombios: declare connector convert tables as static
      drm/radeon/combios: declare legacy_connector_convert as static

 drivers/gpu/drm/radeon/Makefile            |   2 +-
 drivers/gpu/drm/radeon/atombios_encoders.c |  23 ----
 drivers/gpu/drm/radeon/btc_dpm.c           |  51 -------
 drivers/gpu/drm/radeon/btc_dpm.h           |   2 -
 drivers/gpu/drm/radeon/ci_dpm.c            |  26 ----
 drivers/gpu/drm/radeon/dce3_1_afmt.c       |   4 +-
 drivers/gpu/drm/radeon/dce6_afmt.c         |   6 +-
 drivers/gpu/drm/radeon/evergreen_hdmi.c    |  49 ++++++-
 drivers/gpu/drm/radeon/ni_dpm.c            |  24 ----
 drivers/gpu/drm/radeon/r600_audio.c        | 207 -----------------------------
 drivers/gpu/drm/radeon/r600_hdmi.c         | 172 +++++++++++++++++++++++-
 drivers/gpu/drm/radeon/r600d.h             |  17 +++
 drivers/gpu/drm/radeon/radeon.h            |   4 +-
 drivers/gpu/drm/radeon/radeon_asic.h       |   1 -
 drivers/gpu/drm/radeon/radeon_atombios.c   |   6 +-
 drivers/gpu/drm/radeon/radeon_combios.c    |   2 +-
 drivers/gpu/drm/radeon/radeon_encoders.c   |  21 +++
 drivers/gpu/drm/radeon/radeon_mode.h       |   1 +
 drivers/gpu/drm/radeon/si_dpm.c            |  24 ----
 drivers/gpu/drm/radeon/sid.h               |   2 +-
 20 files changed, 267 insertions(+), 377 deletions(-)
 delete mode 100644 drivers/gpu/drm/radeon/r600_audio.c