[pull] amdgpu drm-next-5.12

[Alex Deucher]

On Fri, Jan 15, 2021 at 9:51 AM Alex Deucher <alexdeucher at gmail.com> wrote:
>
> On Fri, Jan 15, 2021 at 2:28 AM Dave Airlie <airlied at gmail.com> wrote:
> >
> > On Fri, 15 Jan 2021 at 07:22, Alex Deucher <alexdeucher at gmail.com> wrote:
> > >
> > > Hi Dave, Daniel,
> > >
> > > More new stuff for 5.12.
> > >
> > > The following changes since commit 044a48f420b9d3c19a135b821c34de5b2bee4075:
> > >
> > >   drm/amdgpu: fix DRM_INFO flood if display core is not supported (bug 210921) (2021-01-08 15:18:57 -0500)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-01-14
> > >
> > > for you to fetch changes up to df1f0560d28f4895e2d61af826728efb61976f9f:
> > >
> > >   drm/amd/display: Simplify bool comparison (2021-01-14 13:20:21 -0500)
> >
> > arm 32/64 builds say no.
> >
> >   CC [M]  drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.o
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
> > In function ‘vangogh_get_smu_metrics_data’:
> > /home/airlied/devel/kernel/dim/src/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 ‘bl_get_data’?
> >           boot_cpu_data.x86_max_cores * sizeof(uint16_t));
> >           ^~~~~~~~~~~~~
> >           bl_get_data
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10:
> > note: each undeclared identifier is reported only once for each
> > function it appears in
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
> > In function ‘vangogh_read_sensor’:
> > /home/airlied/devel/kernel/dim/src/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 ‘bl_get_data’?
> >    *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
> >            ^~~~~~~~~~~~~
> >            bl_get_data
> > /home/airlied/devel/kernel/dim/src/drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:
> > In function ‘vangogh_od_edit_dpm_table’:
> > /home/airlied/devel/kernel/dim/src/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 ‘bl_get_data’?
> >    if (input[0] >= boot_cpu_data.x86_max_cores) {
> >                    ^~~~~~~~~~~~~
> >                    bl_get_data
> > make[5]: *** [/home/airlied/devel/kernel/dim/src/scripts/Makefile.build:279:
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.o] Error 1
> >
> >
> > Not sure using boot_cpu_data in a driver is that good an idea, maybe
> > there is a better interface to get that sort of information, but even
> > so it should build on arm.
>
> I'm not sure if there is a generic interface for this or not, but this
> is for SOC power management on an APU, so it's only relevant to x86.
> I'll send out a patch to fix the build.

Looks like Ray already sent out the fix.  I'll send a new PR once this
is integrated.

Thanks,

Alex

>
> Alex
>
>
> >
> > Dave.