[pull] amdgpu drm-fixes-4.2

[Alex Deucher]

Hi Linus,

Dave is on vacation at the moment, so please pull these fixes directly.
Just a few amdgpu fixes to make sure we report the proper firmware information
and number of render buffers to userspace and a typo in a debugging function.

The following changes since commit 4469942bbbe5ebf845e04971d8c74e9b6178f9fa:

  Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (2015-08-05 18:50:38 +0300)

are available in the git repository at:


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

for you to fetch changes up to 595fd013f795daeed0c7ddda02d8e0c51d8ce76c:

  drm/amdgpu: set fw_version and feature_version for smu fw loading (2015-08-05 14:26:50 -0400)

----------------------------------------------------------------
Alex Deucher (1):
      drm/amdgpu: fix rb setting for CZ

Jammy Zhou (3):
      drm/amdgpu: add feature version for RLC and MEC v2
      drm/amdgpu: add feature version for SDMA ucode
      drm/amdgpu: set fw_version and feature_version for smu fw loading

Nicolas Iooss (1):
      drm/amdgpu: increment queue when iterating on this variable.

 drivers/gpu/drm/amd/amdgpu/amdgpu.h     |  4 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 ++++++------
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c   |  1 +
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c   |  8 +++++++-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c   | 36 +++++++++++++++++++++------------
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c  |  6 ++++--
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c  |  6 ++++--
 7 files changed, 50 insertions(+), 24 deletions(-)