On 2016-08-26 04:20, Michel Dänzer wrote:

On 26/08/16 02:10 AM, Michal Marek wrote:

...

amdgpu loads amdkfd via symbol_request(). Add a softdep hint so that userspace knows that amdgpu needs amdkfd in the initrd.

Reported-and-tested-by: Martin Jambor mjambor@suse.cz Signed-off-by: Michal Marek mmarek@suse.com

---

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 9aa533cf4ad1..9c469cd311ca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -633,3 +633,4 @@ module_exit(amdgpu_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); +MODULE_SOFTDEP("pre: amdkfd");

Will this work if amdkfd isn't built (CONFIG_HSA_AMD=n)?

It's a soft dependency, so it will be silently ignored. /sbin/modprobe --show-depends amdgpu will only list amdgpu.ko and its hard depedencies.

Michal

Both amdgpu and radeon load amdkfd via symbol_request(). Add a softdep hint so that userspace knows that each of them needs amdkfd in the initrd.

Reported-and-tested-by: Martin Jambor mjambor@suse.cz [amdgpu] Reported-by: Michel Dänzer michel@daenzer.net [radeon] Signed-off-by: Michal Marek mmarek@suse.com --- v2: Also patch radeon

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 1 + 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 9aa533cf4ad1..9c469cd311ca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -633,3 +633,4 @@ module_exit(amdgpu_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); +MODULE_SOFTDEP("pre: amdkfd"); diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index c01a7c6abb49..0a60125c0138 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -617,3 +617,4 @@ module_exit(radeon_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL and additional rights"); +MODULE_SOFTDEP("pre: amdkfd");