Messages in this thread | | | Date | Wed, 27 Jul 2022 12:21:17 -0400 | Subject | Re: linux-next: build failure after merge of the amdgpu tree | From | Rodrigo Siqueira Jordao <> |
| |
On 2022-07-25 07:16, 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/../display/amdgpu_dm/amdgpu_dm_crtc.c:297:26: error: 'amdgpu_dm_crtc_late_register' undeclared here (not in a function); did you mean 'amdgpu_umc_ras_late_init'? > 297 | .late_register = amdgpu_dm_crtc_late_register, > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | amdgpu_umc_ras_late_init > > Caused by commit > > a6c0b96cb899 ("drm/amd/display: Create a file dedicated for CRTC") > > I have applied the following hack for today (just to make it build). > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 25 Jul 2022 20:48:29 +1000 > Subject: [PATCH] fixup for "drm/amd/display: Create a file dedicated for CRTC" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c > index 16b624828e0d..3eb6ea3709bc 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c > @@ -293,7 +293,7 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { > .enable_vblank = dm_enable_vblank, > .disable_vblank = dm_disable_vblank, > .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, > -#if defined(CONFIG_DEBUG_FS) > +#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
I guess we had a merge issue here?
If you check the original patch [1,2], you will see:
+#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY) + .late_register = amdgpu_dm_crtc_late_register, +#endif
Anyway, maybe you want to use the above code to keep both branches in sync.
1. https://lore.kernel.org/amd-gfx/20220715181705.1030401-10-Rodrigo.Siqueira@amd.com/ 2. https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c#L297
Thanks Siqueira
> .late_register = amdgpu_dm_crtc_late_register, > #endif > };
| |