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

From: Alex Deucher
Date: Fri Jan 15 2021 - 09:57:34 EST


On Fri, Jan 15, 2021 at 3:46 AM Huang, Ray <Ray.Huang@xxxxxxx> wrote:
>
> [AMD Public Use]
>
> Could you please help to check whether this patch can fix the issue?

Looks good. Might want to add a comment where you set cpu_core_num
that this is only used on APUs which are x86 only.

Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>

>
> Thanks,
> Ray
>
> -----Original Message-----
> From: Huang, Ray <ray.huang@xxxxxxx>
> Sent: Friday, January 15, 2021 1:57 PM
> To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Cc: Alex Deucher <alexdeucher@xxxxxxxxx>; Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>; Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>
> Subject: Re: linux-next: build failure after merge of the amdgpu tree
>
> On Fri, Jan 15, 2021 at 01:35:05PM +0800, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_get_smu_metrics_data':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>
> Ah, vangogh is an x86 cpu, let me look at this issue.
>
> Could you share me the config file you tested?
>
> Thanks,
> Ray
>
> > 300 | boot_cpu_data.x86_max_cores * sizeof(uint16_t));
> > | ^~~~~~~~~~~~~
> > | boot_cpuid
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_read_sensor':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
> > 1320 | *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
> > | ^~~~~~~~~~~~~
> > | boot_cpuid
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_od_edit_dpm_table':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
> > 1460 | if (input[0] >= boot_cpu_data.x86_max_cores) {
> > | ^~~~~~~~~~~~~
> > | boot_cpuid
> >
> > Caused by commits
> >
> > 517cb957c43b ("drm/amd/pm: implement the processor clocks which read by metric")
> > 0d90d0ddd10e ("drm/amd/pm: implement processor fine grain feature for vangogh (v3)")
> >
> > The only thing I could do easily is to disable CONFIG_DRM_AMDGPU for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell
>