RE: linux-next: build failure after merge of the amdgpu tree

From: Huang, Ray
Date: Tue Aug 13 2019 - 04:22:03 EST


> -----Original Message-----
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Sent: Tuesday, August 13, 2019 4:11 PM
> To: Alex Deucher <alexdeucher@xxxxxxxxx>
> Cc: Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>; Linux Kernel
> Mailing List <linux-kernel@xxxxxxxxxxxxxxx>; Liu, Aaron
> <Aaron.Liu@xxxxxxx>; Huang, Ray <Ray.Huang@xxxxxxx>
> Subject: linux-next: build failure after merge of the amdgpu tree
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/psp_v12_0.c:39:17: error: expected
> declaration specifiers or '...' before string constant
> MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
> ^~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 13 Aug 2019 18:03:16 +1000
> Subject: [PATCH] drm/amdgpu: MODULE_FIRMWARE requires
> linux/module.h
>
> Fixes: 6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Thanks!

Reviewed-by: Huang Rui <ray.huang@xxxxxxx>

> ---
> drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> index f37b8af4b986..b474dfb79375 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> @@ -21,6 +21,7 @@
> */
>
> #include <linux/firmware.h>
> +#include <linux/module.h>
> #include "amdgpu.h"
> #include "amdgpu_psp.h"
> #include "amdgpu_ucode.h"
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell