Hi Daniel, On Fri, 24 May 2019 10:09:28 +0200 Daniel Vetter <daniel@xxxxxxxx> wrote: > > On Fri, May 24, 2019 at 12:29 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
Attachment:
pgp8AdKYMx0af.pgp
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel