2019-05-23 22:30:57

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the drm-fixes tree

Hi all,

After merging the drm-fixes tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:667:7: error: implicit declaration of function 'ASICREV_IS_PICASSO'; did you mean 'ASICREV_IS_VEGA12_P'? [-Werror=implicit-function-declaration]
if (ASICREV_IS_PICASSO(adev->external_rev_id))
^~~~~~~~~~~~~~~~~~
ASICREV_IS_VEGA12_P

Caused by commit

55143dc23ca4 ("drm/amd/display: Don't load DMCU for Raven 1")

I have reverted that commit for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-05-24 08:12:39

by Daniel Vetter

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drm-fixes tree

On Fri, May 24, 2019 at 12:29 AM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> After merging the drm-fixes tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:667:7: error: implicit declaration of function 'ASICREV_IS_PICASSO'; did you mean 'ASICREV_IS_VEGA12_P'? [-Werror=implicit-function-declaration]
> if (ASICREV_IS_PICASSO(adev->external_rev_id))
> ^~~~~~~~~~~~~~~~~~
> ASICREV_IS_VEGA12_P
>
> Caused by commit
>
> 55143dc23ca4 ("drm/amd/display: Don't load DMCU for Raven 1")
>
> I have reverted that commit for today.

Seems to compile fine here, and Dave just sent out the pull so I guess
works for him too. What's your .config?
-Daniel

>
> --
> Cheers,
> Stephen Rothwell
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel



--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

2019-05-24 10:19:09

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drm-fixes tree

Hi Daniel,

On Fri, 24 May 2019 10:09:28 +0200 Daniel Vetter <[email protected]> wrote:
>
> On Fri, May 24, 2019 at 12:29 AM Stephen Rothwell <[email protected]> wrote:
> >
> > After merging the drm-fixes tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':
> > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:667:7: error: implicit declaration of function 'ASICREV_IS_PICASSO'; did you mean 'ASICREV_IS_VEGA12_P'? [-Werror=implicit-function-declaration]
> > if (ASICREV_IS_PICASSO(adev->external_rev_id))
> > ^~~~~~~~~~~~~~~~~~
> > ASICREV_IS_VEGA12_P
> >
> > Caused by commit
> >
> > 55143dc23ca4 ("drm/amd/display: Don't load DMCU for Raven 1")
> >
> > I have reverted that commit for today.
>
> Seems to compile fine here, and Dave just sent out the pull so I guess
> works for him too. What's your .config?

See above "x86_64 allmodconfig"

Looking at it closely now, I can't see how that error comes about.

Ah, in the drm-fixes tree, the definition of is protected by

#if defined(CONFIG_DRM_AMD_DC_DCN1_01)

which gets removed in the amdgpu tree (merged later). So I can only
presume that CONFIG_DRM_AMD_DC_DCN1_01 was not set for the build I did.

config DRM_AMD_DC
bool "AMD DC - Enable new display engine"
default y
select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_
COMPARISONS)KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS
select DRM_AMD_DC_DCN1_01 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)

So maybe KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS are set for
allmodconfig. I no longer have the actual .config file any more, sorry.
--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-05-24 10:42:56

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drm-fixes tree

Hi all,

On Fri, 24 May 2019 20:15:48 +1000 Stephen Rothwell <[email protected]> wrote:
>
> Ah, in the drm-fixes tree, the definition of is protected by
^
ASICREV_IS_PICASSO

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-05-24 16:20:49

by Daniel Vetter

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the drm-fixes tree

On Fri, May 24, 2019 at 08:15:48PM +1000, Stephen Rothwell wrote:
> Hi Daniel,
>
> On Fri, 24 May 2019 10:09:28 +0200 Daniel Vetter <[email protected]> wrote:
> >
> > On Fri, May 24, 2019 at 12:29 AM Stephen Rothwell <[email protected]> wrote:
> > >
> > > After merging the drm-fixes tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'load_dmcu_fw':
> > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:667:7: error: implicit declaration of function 'ASICREV_IS_PICASSO'; did you mean 'ASICREV_IS_VEGA12_P'? [-Werror=implicit-function-declaration]
> > > if (ASICREV_IS_PICASSO(adev->external_rev_id))
> > > ^~~~~~~~~~~~~~~~~~
> > > ASICREV_IS_VEGA12_P
> > >
> > > Caused by commit
> > >
> > > 55143dc23ca4 ("drm/amd/display: Don't load DMCU for Raven 1")
> > >
> > > I have reverted that commit for today.
> >
> > Seems to compile fine here, and Dave just sent out the pull so I guess
> > works for him too. What's your .config?
>
> See above "x86_64 allmodconfig"
>
> Looking at it closely now, I can't see how that error comes about.
>
> Ah, in the drm-fixes tree, the definition of is protected by
>
> #if defined(CONFIG_DRM_AMD_DC_DCN1_01)
>
> which gets removed in the amdgpu tree (merged later). So I can only
> presume that CONFIG_DRM_AMD_DC_DCN1_01 was not set for the build I did.
>
> config DRM_AMD_DC
> bool "AMD DC - Enable new display engine"
> default y
> select DRM_AMD_DC_DCN1_0 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_
> COMPARISONS)KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS
> select DRM_AMD_DC_DCN1_01 if X86 && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS)
>
> So maybe KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS are set for
> allmodconfig. I no longer have the actual .config file any more, sorry.

Ah yes. Dave figured it out too and added a revert on top and redid the
pull to Linus. Thanks for spotting&reporting this.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch