From patchwork Mon Jul 15 23:24:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srivatsa, Anusha" X-Patchwork-Id: 11045103 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8FFBE6C5 for ; Mon, 15 Jul 2019 23:34:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C43D27F8E for ; Mon, 15 Jul 2019 23:34:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B11E284D4; Mon, 15 Jul 2019 23:34:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1532327F8E for ; Mon, 15 Jul 2019 23:34:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E9F9589CC9; Mon, 15 Jul 2019 23:34:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id E5D2489CC9 for ; Mon, 15 Jul 2019 23:34:11 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jul 2019 16:34:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,494,1557212400"; d="scan'208";a="250976477" Received: from anusha.jf.intel.com ([10.54.75.177]) by orsmga001.jf.intel.com with ESMTP; 15 Jul 2019 16:34:11 -0700 From: Anusha Srivatsa To: intel-gfx@lists.freedesktop.org Date: Mon, 15 Jul 2019 16:24:22 -0700 Message-Id: <20190715232422.9626-1-anusha.srivatsa@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/guc: Define GuC firmware version for Comet Lake X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Load GuC for Comet Lake. Depending on the REVID, we load either the KBL firmware or the CML firmware. v2: Use CFL for CML platform check.(Michal) v3: Use >=5 for future proofing(Michal, Daniele) v4: rebased. Cc: Michal Wajdeczko Cc: Daniele Ceraolo Spurio Signed-off-by: Anusha Srivatsa --- drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c index 3dfa40fdbe99..c30cca292ec6 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c @@ -52,6 +52,13 @@ MODULE_FIRMWARE(SKL_GUC_FIRMWARE_PATH); #define BXT_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(BXT) MODULE_FIRMWARE(BXT_GUC_FIRMWARE_PATH); +#define CML_GUC_FW_PREFIX cml +#define CML_GUC_FW_MAJOR 33 +#define CML_GUC_FW_MINOR 0 +#define CML_GUC_FW_PATCH 0 +#define CML_GUC_FIRMWARE_PATH __MAKE_GUC_FW_PATH(CML) +MODULE_FIRMWARE(CML_GUC_FIRMWARE_PATH); + #define KBL_GUC_FW_PREFIX kbl #define KBL_GUC_FW_MAJOR 33 #define KBL_GUC_FW_MINOR 0 @@ -99,7 +106,17 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) guc_fw->path = GLK_GUC_FIRMWARE_PATH; guc_fw->major_ver_wanted = GLK_GUC_FW_MAJOR; guc_fw->minor_ver_wanted = GLK_GUC_FW_MINOR; - } else if (IS_KABYLAKE(i915) || IS_COFFEELAKE(i915)) { + } else if (IS_COFFEELAKE(i915)) { + if (INTEL_REVID(i915) >= 5) { + guc_fw->path = CML_GUC_FIRMWARE_PATH; + guc_fw->major_ver_wanted = CML_GUC_FW_MAJOR; + guc_fw->minor_ver_wanted = CML_GUC_FW_MINOR; + } else { + guc_fw->path = KBL_GUC_FIRMWARE_PATH; + guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR; + guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR; + } + } else if (IS_KABYLAKE(i915)) { guc_fw->path = KBL_GUC_FIRMWARE_PATH; guc_fw->major_ver_wanted = KBL_GUC_FW_MAJOR; guc_fw->minor_ver_wanted = KBL_GUC_FW_MINOR;