Merge tag 'drm-amdkfd-fixes-2017-07-18' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Fri, 21 Jul 2017 04:00:40 +0000 (14:00 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Jul 2017 04:00:40 +0000 (14:00 +1000)
commit22a548d04853297b3855dcac2881d0cb52e3b99c
tree3e7d64542b720f1618b4cf2d125acfa3176b487e
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877
parentf835edf9aec13bc8abb3dd4836151773cc359f42
Merge tag 'drm-amdkfd-fixes-2017-07-18' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes

This is a pull request for 4.13-rc2/3. The first patch addresses a bug that
appears when doing over-subscription of queues, due to a miscalculation of
the number of available compute queues. The other three patches remove
dead code that was created from the bugfix.

* tag 'drm-amdkfd-fixes-2017-07-18' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdgpu: Remove unused field kgd2kfd_shared_resources.num_mec
  drm/radeon: Remove initialization of shared_resources.num_mec
  drm/amdkfd: Remove unused references to shared_resources.num_mec
  drm/amdgpu: Fix KFD oversubscription by tracking queues correctly