On Sun, Feb 14, 2016 at 4:16 AM, Oded Gabbay <oded.gabbay@xxxxxxxxx> wrote: > Following Daniel's request, I spent some time removing the hard requirement > that radeon and amdgpu will always appear _after_ amdkfd in the drm Makefile. > > This was done by modifing radeon/amdgpu to defer their loading if they detect > that amdkfd is not loaded yet, in case the drivers are built inside the > kernel image. > > See the patch's individiual commit messages for more explanation. > > This patch-set was tested on a KAVERI machine, with multiple configurations: > > 1. radeon + amdgpu (CIK disabled) + amdkfd as kernel modules > 2. radeon + amdgpu (CIK disabled) + amdkfd inside the kernel image > 3. amdgpu (CIK enabled) + amdkfd inside the kernel image (radeon not compiled) > 4. amdgpu (CIK enabled) inside the kernel image (radeon + amdkfd not compiled) > 5. radeon + amdgpu (CIK disabled) as kernel modules (amdkfd not compiled) For the series: Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > > Thanks, > > Oded > > 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(-) > > -- > 2.5.0 > _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
