[PULL] drm-amdkfd-next

Submitted by Oded Gabbay on Feb. 27, 2016, 9:07 p.m.

Details

Message ID 20160227210741.GA5369@odedg-tlv.redhat.com
State New
Headers show

Not browsing as part of any series.

Pull-request download mbox

git pull git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-02-27

Commit Message

Oded Gabbay Feb. 27, 2016, 9:07 p.m.
Hi Dave,

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.

Thanks,

Oded

The following changes since commit 44ab4042178bd596275927ea050980aa4257581b:

  Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next (2016-02-26 13:02:57 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-02-27

for you to fetch changes up to efb1c6582e5cd291a6b9e6dde55fd31ce6f606a1:

  drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded (2016-02-27 22:52:40 +0200)

----------------------------------------------------------------
Oded Gabbay (3):
      drm/amdkfd: Track when module's init is complete
      drm/radeon: Return -EPROBE_DEFER when amdkfd not loaded
      drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c      | 57 +++++++++----------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h      |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c         | 10 ++++-
 drivers/gpu/drm/amd/amdkfd/kfd_module.c         | 15 +++++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h |  2 +-
 drivers/gpu/drm/radeon/radeon_drv.c             | 10 ++++-
 drivers/gpu/drm/radeon/radeon_kfd.c             | 25 ++++++-----
 drivers/gpu/drm/radeon/radeon_kfd.h             |  2 +-
 8 files changed, 64 insertions(+), 59 deletions(-)