From patchwork Wed Dec 9 01:53:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11960151 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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 DC7C8C4361B for ; Wed, 9 Dec 2020 01:54:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81F06238EB for ; Wed, 9 Dec 2020 01:54:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81F06238EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7DD589D7D; Wed, 9 Dec 2020 01:54:08 +0000 (UTC) Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 15F1789D77; Wed, 9 Dec 2020 01:54:06 +0000 (UTC) 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 Message-ID: <20201209125357.64825ba6@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: build failure after merge of the drm tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Lucas De Marchi , Linux Kernel Mailing List , Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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_ENTRIES'? 363 | table->n_entries = GEN11_NUM_MOCS_ENTRIES; | ^~~~~~~~~~~~~~~~~~~~~~ | GEN9_NUM_MOCS_ENTRIES drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: note: each undeclared identifier 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 = ARRAY_SIZE(dg1_mocs_table); table->table = dg1_mocs_table; - table->n_entries = GEN11_NUM_MOCS_ENTRIES; + table->n_entries = GEN9_NUM_MOCS_ENTRIES; } else if (INTEL_GEN(i915) >= 12) { table->size = ARRAY_SIZE(tgl_mocs_table); table->table = tgl_mocs_table;