Merge tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux...
authorDave Airlie <airlied@redhat.com>
Tue, 1 Mar 2016 02:33:33 +0000 (12:33 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 1 Mar 2016 02:33:33 +0000 (12:33 +1000)
commit9d5d6752c720c9dfa27ba7f258a07a6e0a7aa286
tree7df0ba8c47f1ec68a0a5c609b3adc16d7e5763ff
parent44ab4042178bd596275927ea050980aa4257581b
parentefb1c6582e5cd291a6b9e6dde55fd31ce6f606a1
Merge tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Here are a few amdkfd patches for 4.6.
These patches defer radeon/amdgpu loading in case amdkfd is not yet loaded,
by returning -EPROBE_DEFER during their probing stage.

* tag 'drm-amdkfd-next-2016-02-27' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded
  drm/radeon: Return -EPROBE_DEFER when amdkfd not loaded
  drm/amdkfd: Track when module's init is complete