| Message ID | 1472145033-24370-1-git-send-email-mmarek@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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)?
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
On 26/08/16 06:16 PM, Michal Marek wrote: > 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. Thanks for the clarification. The radeon driver probably needs this as well?
On 2016-08-29 03:37, Michel Dänzer wrote: > On 26/08/16 06:16 PM, Michal Marek wrote: >> 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. > > Thanks for the clarification. > > The radeon driver probably needs this as well? You are right. I sent a v2 covering radeon as well. Thanks, Michal
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");
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(+)