LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>,
	Alex Deucher <alexander.deucher@amd.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Subject: Re: linux-next: build failure after merge of the drm-fixes tree
Date: Fri, 24 May 2019 18:19:22 +0200	[thread overview]
Message-ID: <20190524161922.GB21222@phenom.ffwll.local> (raw)
In-Reply-To: <20190524201548.2e8594a2@canb.auug.org.au>

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 <daniel@ffwll.ch> wrote:
> >
> > On Fri, May 24, 2019 at 12:29 AM Stephen Rothwell <sfr@canb.auug.org.au> 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

      parent reply	other threads:[~2019-05-24 16:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23 22:29 Stephen Rothwell
2019-05-24  8:09 ` Daniel Vetter
2019-05-24 10:15   ` Stephen Rothwell
2019-05-24 10:41     ` Stephen Rothwell
2019-05-24 16:19     ` Daniel Vetter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190524161922.GB21222@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=airlied@linux.ie \
    --cc=alexander.deucher@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nicholas.kazlauskas@amd.com \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: build failure after merge of the drm-fixes tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).