commit 0d83b72acdab62e431393926a903255d32dc8dd1
author Dave Airlie <airlied@redhat.com> Wed Dec 24 12:59:08 2014 +1000
committer Dave Airlie <airlied@redhat.com> Wed Dec 24 12:59:08 2014 +1000
tree 01167bce3fe104c8a63b4a4d93cbba5caad2327d
parent bd8136d397c72e16d61810bb71d92656acfc66e6
parent dd59239a9862a42e4b8d47e4aaa8d595d08c29ab

Merge tag 'amdkfd-fixes-2014-12-23' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

- Display MEC fw version in topology. Without this, the HSA userspace
  stack is broken.

- Init apertures information only once per process

* tag 'amdkfd-fixes-2014-12-23' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: init aperture once per process
  amdkfd: Display MEC fw version in topology node
  drm/radeon: Add implementation of get_fw_version
  drm/amd: Add get_fw_version to kfd-->kgd interface