Messages in this thread Patch in this message | | | Date | Mon, 25 Jul 2022 21:16:12 +1000 | From | Stephen Rothwell <> | Subject | linux-next: build failure after merge of the amdgpu tree |
| |
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 .late_register = amdgpu_dm_crtc_late_register, #endif }; -- 2.35.1 -- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |