]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'drm-amdkfd-fixes-2015-05-07' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Fri, 8 May 2015 10:52:51 +0000 (20:52 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 May 2015 10:52:51 +0000 (20:52 +1000)
- Add missing initialization of SDMA vm register when creating an SDMA queue
- Don't report local memory size, as we don't support local memory allocation
  yet.
- Allow to unregister process with exisiting queues. Until now we blocked
  it with BUG_ON, which was also an error by itself.

* tag 'drm-amdkfd-fixes-2015-05-07' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Initialize sdma vm when creating sdma queue
  drm/amdkfd: Don't report local memory size
  drm/amdkfd: allow unregister process with queues


Trivial merge