Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 25 Jul 2022 21:16:12 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>
Cc:     Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the amdgpu tree
Message-ID: <20220725211612.7e3331ff@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QKktcAAIFJeGUdWVtcJu.G6";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/QKktcAAIFJeGUdWVtcJu.G6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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: er=
ror: 'amdgpu_dm_crtc_late_register' undeclared here (not in a function); di=
d you mean 'amdgpu_umc_ras_late_init'?
  297 |         .late_register =3D 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 CR=
TC"

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/drive=
rs/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=
 =3D {
 	.enable_vblank =3D dm_enable_vblank,
 	.disable_vblank =3D dm_disable_vblank,
 	.get_vblank_timestamp =3D drm_crtc_vblank_helper_get_vblank_timestamp,
-#if defined(CONFIG_DEBUG_FS)
+#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
 	.late_register =3D amdgpu_dm_crtc_late_register,
 #endif
 };
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/QKktcAAIFJeGUdWVtcJu.G6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLee3wACgkQAVBC80lX
0GysoQgAl203WWglwrP+OiOpXuL6r5dW8lBcrmPO59mBIGY6cwL7A0PMp6gRnEej
BjPZZ8Ni0TmkGsHXXH3ZAScxXghIjg5ll4halL5WWntmbMxRxixEkCdvLR34mfSH
iG5rNxprW20irtAJ365nRHyfc35AkRKkhe6D281q/vhQPTvk3q56oD2FuLsSvZ4p
/yzWboBOvq2qOohs87N0KiQ6iwELcQ4mK7Cu2maGs3mtyHzRAe6yyRIRPCystso7
MHDXU4jjJxdIOmkRNmJd1qvJ8esnUl3kdcfE763/V2Kzf024/XvrNUkHT3OkMDfN
oUJiKzvs5J+eMLtF7nlIL/uPQV0AuA==
=dM7T
-----END PGP SIGNATURE-----

--Sig_/QKktcAAIFJeGUdWVtcJu.G6--