From patchwork Tue Jan 19 21:18:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Antoine X-Patchwork-Id: 8064931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 17E2E9F96D for ; Tue, 19 Jan 2016 21:19:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56A5720552 for ; Tue, 19 Jan 2016 21:19:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 770AB2054E for ; Tue, 19 Jan 2016 21:19:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA9806E892; Tue, 19 Jan 2016 13:19:09 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 417736E892 for ; Tue, 19 Jan 2016 13:19:03 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP; 19 Jan 2016 13:19:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,319,1449561600"; d="scan'208";a="32530308" Received: from peterant-linux2.isw.intel.com ([10.102.226.179]) by fmsmga004.fm.intel.com with ESMTP; 19 Jan 2016 13:19:01 -0800 From: Peter Antoine To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Jan 2016 21:18:51 +0000 Message-Id: <1453238331-35864-3-git-send-email-peter.antoine@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453238331-35864-1-git-send-email-peter.antoine@intel.com> References: <1453238331-35864-1-git-send-email-peter.antoine@intel.com> Cc: daniel.vetter@ffwll.ch, dave.gordon@intel.com Subject: [Intel-gfx] [PATCH 2/2] i915/guc: Add Kabylake GuC Loading X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware. Signed-off-by: Peter Antoine Signed-off-by: Michel Thierry --- drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 3accd91..bbfa8f3 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -61,6 +61,8 @@ #define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin" MODULE_FIRMWARE(I915_SKL_GUC_UCODE); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin" +MODULE_FIRMWARE(I915_KBL_GUC_UCODE); /* User-friendly representation of an enum */ const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) @@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev) fw_path = I915_SKL_GUC_UCODE; guc_fw->guc_fw_major_wanted = 4; guc_fw->guc_fw_minor_wanted = 3; + } else if (IS_KABYLAKE(dev)) { + fw_path = I915_KBL_GUC_UCODE; + guc_fw->guc_fw_major_wanted = 2; + guc_fw->guc_fw_minor_wanted = 4; } else { i915.enable_guc_submission = false; fw_path = ""; /* unknown device */