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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9A1FDC4828F for ; Fri, 2 Feb 2024 20:03:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5811D10E1B7; Fri, 2 Feb 2024 20:03:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="TT5HF7sx"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDEEB10E1B7 for ; Fri, 2 Feb 2024 20:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706904181; x=1738440181; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sWKmOY4Qmns+3EpPAaEGa4obnXSsN1D0oOAprQNnUZc=; b=TT5HF7sxBIK6E4XvB9xdh6+YrOWexIs2sTts6NsQTmd1I6bbd0NIvPzG vHq/6A/jbqmgH9rU9qdvdTqd0n0hCpZDkEw1CZKrING4o3zXgbAP2S/RB 5xVs2tCiJ3yN27i2F5vRf/fWnudvXtKPdscLjHiopXMhFjup5MCn+z6/+ hSHM3v8L7IRHOC2AvsJdAlf0yp8BG2YMsoHgXLTOhYmQsRYEK3jcnyb+U FPCcjShSYbOkpLJcq2i+JISHOTrrB/eNwyUV9ia5Ht76PLAAnEjw+cr3Z bZjTFE9Xn4v2VN3eYvhhfHouzm4twSDf1qvp8E7jh/xuG/BCshMCq7jTw Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="3188619" X-IronPort-AV: E=Sophos;i="6.05,238,1701158400"; d="scan'208";a="3188619" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2024 12:02:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,238,1701158400"; d="scan'208";a="439121" Received: from relo-linux-5.jf.intel.com ([10.165.21.152]) by fmviesa006.fm.intel.com with ESMTP; 02 Feb 2024 12:02:59 -0800 From: John.C.Harrison@Intel.com To: Intel-Xe@Lists.FreeDesktop.Org Cc: John Harrison Subject: [PATCH v2 1/6] Revert "drm/xe/guc: define LNL FW" Date: Fri, 2 Feb 2024 12:00:12 -0800 Message-ID: <20240202200017.2133438-2-John.C.Harrison@Intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240202200017.2133438-1-John.C.Harrison@Intel.com> References: <20240202200017.2133438-1-John.C.Harrison@Intel.com> MIME-Version: 1.0 Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" From: John Harrison This reverts commit e4cfe0cd981952f6ed3d5b92a0b7e3ae0b3ad2b4. Reverting patch from topic/xe-for-CI branch which should be dropped completely. It is now superceeded by the patch later in this series which is to be merged to the main tree. Signed-off-by: John Harrison --- drivers/gpu/drm/xe/xe_uc_fw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index 73d6938c921d..92940199ba4a 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -102,7 +102,6 @@ struct fw_blobs_by_type { }; #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \ - fw_def(LUNARLAKE, mmp_ver(xe, guc, lnl, 70, 6, 8)) \ fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 7)) \ fw_def(PVC, mmp_ver(xe, guc, pvc, 70, 9, 1)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 5)) \ -- 2.43.0