From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E949C433FE for ; Wed, 9 Dec 2020 01:55:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC6B423975 for ; Wed, 9 Dec 2020 01:55:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726328AbgLIByt (ORCPT ); Tue, 8 Dec 2020 20:54:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725808AbgLIByt (ORCPT ); Tue, 8 Dec 2020 20:54:49 -0500 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A56D1C0613CF; Tue, 8 Dec 2020 17:54:08 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CrKpd66Q7z9sWC; Wed, 9 Dec 2020 12:54:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607478845; bh=XkobUWF4UCE6YB4ZVvIM/Nb3XrVq1YtY0YGEJG7PsOA=; h=Date:From:To:Cc:Subject:From; b=tSgLF5vL0Ol3CumHzKUtpGQTFwtVmISJo4eb/2X6cx/yTfI9JvzCDTTUJfWeUMqdg P29NZQlaqV/Nbg94gMaLMXZ4WSovUCFV9r9H9KKMb26rNUuQbsZjmAyfu7wuhm62Jk L0SuD2iiZjxKoKMNkkl7I72TJxwPpJrP7jH4Re/PxkVCwbwnbEixS3a7+cc0X+kapM mI7zooQxcG1yxXBibrFPs8JaEaoFn9hzXsxXRrPgaDX4rRE4WbjBctON7H2g5D2vj1 OxXSi45W3kkaRoJBroV2qhj9QXM1ISAFea1QvABBB++5wbYaTddLESjLCC0St1wXK7 UaHzGPBSf+vHw== Date: Wed, 9 Dec 2020 12:53:57 +1100 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Lucas De Marchi , Chris Wilson , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm tree Message-ID: <20201209125357.64825ba6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/HfdbGgst59xfm+MdcwzgdOm"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/HfdbGgst59xfm+MdcwzgdOm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i915/gt/intel_mocs.c: In function 'get_mocs_settings': drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: error: 'GEN11_NUM_MOCS_ENTRIES= ' undeclared (first use in this function); did you mean 'GEN9_NUM_MOCS_ENTR= IES'? 363 | table->n_entries =3D GEN11_NUM_MOCS_ENTRIES; | ^~~~~~~~~~~~~~~~~~~~~~ | GEN9_NUM_MOCS_ENTRIES drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: note: each undeclared identifi= er is reported only once for each function it appears in Caused by commit 2606b269234b ("drm/i915/dg1: Define MOCS table for DG1") interacting with commit 7c5c15dffe1e ("drm/i915/gt: Declare gen9 has 64 mocs entries!") from the drm-intel-fixes tree. I have applied the following merge fix patch for today: From: Stephen Rothwell Date: Wed, 9 Dec 2020 12:47:45 +1100 Subject: [PATCH] fixup for "drm/i915/gt: Declare gen9 has 64 mocs entries!" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt= /intel_mocs.c index c60ca62b38df..ab6870242e18 100644 --- a/drivers/gpu/drm/i915/gt/intel_mocs.c +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c @@ -360,7 +360,7 @@ static unsigned int get_mocs_settings(const struct drm_= i915_private *i915, if (IS_DG1(i915)) { table->size =3D ARRAY_SIZE(dg1_mocs_table); table->table =3D dg1_mocs_table; - table->n_entries =3D GEN11_NUM_MOCS_ENTRIES; + table->n_entries =3D GEN9_NUM_MOCS_ENTRIES; } else if (INTEL_GEN(i915) >=3D 12) { table->size =3D ARRAY_SIZE(tgl_mocs_table); table->table =3D tgl_mocs_table; --=20 2.29.2 --=20 Cheers, Stephen Rothwell --Sig_/HfdbGgst59xfm+MdcwzgdOm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/QLjUACgkQAVBC80lX 0Gz5ggf+NrbactnKgEiOkh1f2npSckBhtJB9lyQ9hAWTDv3JexDzJ/WU2iDD5Xnb J7xKsPQ8DNL35r7oedLYPG+NgV5lUT5XsOdNZkbKij1GRscgZK7g1wgPX/F/zHZD OlR0BVllXJpHTpf1IOvN/1yOS1+Scf3fNe5YBiCJ9DiYUe9SvuPrS9Q8tj3OLzLg y+EnDROuyboeR3qaDresZFPJbIKC+3WsugjDbTUk9U5H/A+kZhogJYUohLebbiJx ng7b3IgualZb+yDxi40FPx+IM1HAYx7ngn78v7zet9psY8jyVdYu8PoqjdJ6Jlk5 UDxP/sCwHfSpZObfw3ljf2ijTk0d2A== =aGSv -----END PGP SIGNATURE----- --Sig_/HfdbGgst59xfm+MdcwzgdOm--