Re: linux-next: build failure after merge of the amdgpu tree
From: Alex Deucher
Date: Tue Jan 28 2020 - 16:18:55 EST
On Mon, Jan 27, 2020 at 11:42 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c: In function 'psp_v11_0_memory_training':
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:9: error: implicit declaration of function 'vmalloc'; did you mean 'kvmalloc'? [-Werror=implicit-function-declaration]
> 1047 | buf = vmalloc(sz);
> | ^~~~~~~
> | kvmalloc
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:7: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
> 1047 | buf = vmalloc(sz);
> | ^
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1057:4: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
> 1057 | vfree(buf);
> | ^~~~~
> | kvfree
>
> Caused by commit
>
> 240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")
>
> I have applied this patch for today:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 28 Jan 2020 15:33:44 +1100
> Subject: [PATCH] amdgpu: using vmalloc requires includeing vmalloc.h
>
> Fixes: 240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Applied. thanks!
Alex
> ---
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index ac173d2eb809..0829188c1a5c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -22,6 +22,7 @@
>
> #include <linux/firmware.h>
> #include <linux/module.h>
> +#include <linux/vmalloc.h>
>
> #include "amdgpu.h"
> #include "amdgpu_psp.h"
> --
> 2.24.1
>
> --
> Cheers,
> Stephen Rothwell