From: Dave Airlie <airlied@redhat.com>
Date: Wed, 24 Dec 2014 02:59:08 +0000 (+1000)
Subject: Merge tag 'amdkfd-fixes-2014-12-23' of git://people.freedesktop.org/~gabbayo/linux... 
X-Git-Tag: firefly_0821_release~176^2~2593^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0d83b72acdab62e431393926a903255d32dc8dd1;p=firefly-linux-kernel-4.4.55.git

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
---

0d83b72acdab62e431393926a903255d32dc8dd1