From: Rodrigo Siqueira Jordao <Rodrigo.Siqueira@amd.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Alex Deucher <alexdeucher@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the amdgpu tree
Date: Wed, 27 Jul 2022 12:21:17 -0400 [thread overview]
Message-ID: <f10da3c3-f688-b948-c058-28a448bec0d5@amd.com> (raw)
In-Reply-To: <20220725211612.7e3331ff@canb.auug.org.au>
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
> };
next prev parent reply other threads:[~2022-07-27 16:21 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 11:16 linux-next: build failure after merge of the amdgpu tree Stephen Rothwell
2022-07-27 16:21 ` Rodrigo Siqueira Jordao [this message]
2022-07-27 16:23 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2024-02-13 4:00 Stephen Rothwell
2024-02-13 14:00 ` Alex Deucher
2023-10-10 1:43 Stephen Rothwell
2023-10-10 21:14 ` Rodrigo Siqueira Jordao
2023-10-16 0:39 ` Stephen Rothwell
2023-10-16 14:53 ` Rodrigo Siqueira Jordao
2023-10-16 20:59 ` Stephen Rothwell
2023-10-17 1:08 ` Stephen Rothwell
2023-10-16 0:18 ` Stephen Rothwell
2023-10-19 1:06 ` Stephen Rothwell
2023-10-24 0:59 ` Stephen Rothwell
2023-10-24 12:57 ` Alex Deucher
2023-10-24 19:52 ` Alex Deucher
2023-10-24 21:47 ` Stephen Rothwell
2023-05-22 7:15 Stephen Rothwell
2023-05-22 16:29 ` Nick Desaulniers
2023-05-22 16:35 ` Alex Deucher
2023-05-22 16:47 ` Nick Desaulniers
2023-05-22 19:14 ` Alex Deucher
2023-05-22 7:11 Stephen Rothwell
2023-05-22 7:24 ` Lazar, Lijo
2023-05-22 7:00 Stephen Rothwell
2023-05-22 7:04 ` Zhang, Hawking
2023-05-19 0:06 Stephen Rothwell
2023-05-19 3:10 ` James Zhu
2023-05-19 13:38 ` Alex Deucher
2023-01-30 1:20 Stephen Rothwell
2022-10-31 0:13 Stephen Rothwell
2022-08-30 1:41 Stephen Rothwell
2022-07-19 2:36 Stephen Rothwell
2022-07-20 2:47 ` Stephen Rothwell
2022-07-21 2:16 ` Stephen Rothwell
2022-07-22 2:52 ` Stephen Rothwell
2022-07-22 13:30 ` Alex Deucher
2022-06-23 6:07 Stephen Rothwell
2022-06-23 11:01 ` Greg KH
2022-06-27 14:40 ` Greg KH
2022-06-15 4:37 Stephen Rothwell
2022-06-15 18:17 ` Alex Deucher
2022-06-14 4:51 Stephen Rothwell
2022-06-03 4:43 Stephen Rothwell
2022-06-09 3:14 ` Stephen Rothwell
2022-06-15 5:00 ` Stephen Rothwell
2022-06-21 8:15 ` Stephen Rothwell
2022-06-21 15:02 ` Alex Deucher
2022-06-21 22:07 ` Stephen Rothwell
2022-06-22 14:48 ` Alex Deucher
2022-06-23 7:47 ` Stephen Rothwell
2022-06-02 0:30 Stephen Rothwell
2022-05-06 1:06 Stephen Rothwell
2022-05-05 9:47 Stephen Rothwell
2022-05-05 18:12 ` Nathan Chancellor
2022-05-05 18:46 ` Alex Deucher
2022-05-06 1:05 ` Stephen Rothwell
[not found] <BN9PR12MB5145ECB75120FF9AC1AA4CFB8DEC9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-13 14:18 ` Alex Deucher
[not found] ` <BN9PR12MB5145D81F9978B656E9BB67C78DEF9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-14 14:23 ` Rodrigo Siqueira Jordao
2022-04-14 14:27 ` Alex Deucher
2022-04-14 14:31 ` Rodrigo Siqueira Jordao
2022-04-13 2:32 Stephen Rothwell
2022-04-08 4:46 Stephen Rothwell
2022-03-07 0:13 Stephen Rothwell
2022-03-07 7:16 ` Uwe Kleine-König
2022-03-07 13:04 ` Mark Brown
2022-03-08 11:15 ` Noralf Trønnes
2022-02-15 0:57 Stephen Rothwell
2022-02-01 3:32 Stephen Rothwell
2022-02-01 18:32 ` Limonciello, Mario
2022-02-01 18:53 ` Alex Deucher
2022-01-26 23:42 Stephen Rothwell
2022-01-14 0:36 Stephen Rothwell
2022-01-14 23:25 ` Stephen Rothwell
2021-12-03 1:11 Stephen Rothwell
2021-11-18 4:23 Stephen Rothwell
2021-10-08 0:31 Stephen Rothwell
2021-10-08 6:27 ` Simon Ser
2021-10-08 8:29 ` Stephen Rothwell
2021-10-08 9:22 ` Simon Ser
2021-10-08 14:11 ` Alex Deucher
2021-10-08 18:07 ` Simon Ser
2021-10-11 7:33 ` Christoph Hellwig
2021-10-11 7:39 ` Simon Ser
2021-10-11 7:43 ` Christoph Hellwig
2021-10-11 7:49 ` Simon Ser
2021-10-11 7:51 ` Christoph Hellwig
2021-10-11 7:57 ` Simon Ser
2021-10-11 8:01 ` Christoph Hellwig
2021-10-11 8:21 ` Simon Ser
2021-10-09 4:57 ` Stephen Rothwell
2021-10-12 2:25 ` Stephen Rothwell
2021-10-12 13:32 ` Alex Deucher
2021-09-29 1:20 Stephen Rothwell
2021-09-17 0:57 Stephen Rothwell
2021-08-02 15:55 linux-next: Build " Mark Brown
2021-07-28 12:34 linux-next: build " Mark Brown
2021-05-27 5:58 Stephen Rothwell
2021-05-04 23:34 Stephen Rothwell
2021-05-09 22:46 ` Stephen Rothwell
2021-05-10 14:24 ` Alex Deucher
2021-05-10 22:18 ` Stephen Rothwell
2021-05-10 22:23 ` Alex Deucher
2021-05-10 23:02 ` Stephen Rothwell
2021-03-30 2:18 Stephen Rothwell
2021-03-19 1:21 Stephen Rothwell
2021-02-23 1:11 Stephen Rothwell
2021-02-05 2:12 Stephen Rothwell
2021-01-15 5:35 Stephen Rothwell
2021-01-15 5:57 ` Huang Rui
2021-01-15 8:46 ` Huang, Ray
2021-01-15 14:56 ` Alex Deucher
2021-01-08 1:17 Stephen Rothwell
2020-10-27 1:08 Stephen Rothwell
2020-06-17 0:26 Stephen Rothwell
2020-06-12 0:25 Stephen Rothwell
2020-06-26 1:47 ` Stephen Rothwell
2020-02-11 22:48 Stephen Rothwell
2020-02-12 16:14 ` Rodrigo Siqueira
2020-01-28 4:42 Stephen Rothwell
2020-01-28 21:18 ` Alex Deucher
2020-01-08 2:18 Stephen Rothwell
2019-11-08 5:31 Stephen Rothwell
2019-11-08 15:50 ` Grodzovsky, Andrey
2019-11-08 15:59 ` Alex Deucher
2019-11-07 0:46 Stephen Rothwell
2019-08-13 8:10 Stephen Rothwell
2019-08-13 8:21 ` Huang, Ray
2019-08-13 14:01 ` Alex Deucher
2019-08-16 0:21 ` Stephen Rothwell
2019-08-16 1:52 ` Alex Deucher
2019-08-16 2:43 ` Stephen Rothwell
2019-06-26 11:22 Stephen Rothwell
2019-06-27 3:35 ` Stephen Rothwell
2019-06-27 14:18 ` Alex Deucher
2019-06-27 22:01 ` Stephen Rothwell
2019-06-24 4:24 Stephen Rothwell
2019-03-19 0:04 Stephen Rothwell
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=f10da3c3-f688-b948-c058-28a448bec0d5@amd.com \
--to=rodrigo.siqueira@amd.com \
--cc=alexdeucher@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).