Merge tag 'drm-amdkfd-next-2015-03-25' of git://people.freedesktop.org/~gabbayo/linux...
authorDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2015 03:36:25 +0000 (13:36 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2015 03:36:25 +0000 (13:36 +1000)
commitb1f389ecc20b95f0f64515588d3736e85146848f
treec8a37c4ad4af5c8b9dd770be141e3973b42d05e5
parent517bc04582afbd3cd441d363656a064d0e285fbe
parentcea405b172e3b1fd2cf9da5ec05c7d808d6af03d
Merge tag 'drm-amdkfd-next-2015-03-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next

- Allow amdkfd to work with multiple kgd instances. This is in preparation for
  AMD's new open source kernel graphic driver (amdgpu), and for the new
  AMD APU, Carrizo.

- Convert timestamping to use 64bit time accessors

- Three other minor changes.

* tag 'drm-amdkfd-next-2015-03-25' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Add multiple kgd support
  drm/amdkfd: Convert timestamping to use 64bit time accessors
  drm/amdkfd: add debug prints for process teardown
  drm/amdkfd: Remove unused field from struct qcm_process_device
  drm/amdkfd: rename fence_wait_timeout