tree e4ca1261c5cc870b8dc229e0e36fcc3e86b7b344
parent 4a87b990801a74874ace5b84e5f7563de202c013
parent e405ca3a1bf166f741506c07c2a277b5d48af8f7
author Dave Airlie <airlied@redhat.com> 1426836721 +1000
committer Dave Airlie <airlied@redhat.com> 1426836721 +1000

Merge tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

- Fixing SDMA initialization when in non-HWS mode (debug mode)
- Memory leak fix when destroying kernel queue
- Fix number of available compute pipelines according to new firmware

* tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux:
  drm/radeon: Changing number of compute pipe lines
  drm/amdkfd: Fix SDMA queue init. in non-HWS mode
  drm/amdkfd: destroy mqd when destroying kernel queue