From patchwork Fri Sep 2 08:08:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Antoine X-Patchwork-Id: 9310531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B47860772 for ; Fri, 2 Sep 2016 08:09:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EC5D296F7 for ; Fri, 2 Sep 2016 08:09:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63C5F296F9; Fri, 2 Sep 2016 08:09:01 +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=-4.2 required=2.0 tests=BAYES_00, 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 16F45296F7 for ; Fri, 2 Sep 2016 08:09:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 948DE6EA2C; Fri, 2 Sep 2016 08:09:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id EECD86EA2C for ; Fri, 2 Sep 2016 08:08:58 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 02 Sep 2016 01:08:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,270,1470726000"; d="scan'208"; a="1044789574" Received: from peterant-linux2.isw.intel.com ([10.102.226.41]) by orsmga002.jf.intel.com with ESMTP; 02 Sep 2016 01:08:58 -0700 From: Peter Antoine To: intel-gfx@lists.freedesktop.org Date: Fri, 2 Sep 2016 09:08:44 +0100 Message-Id: <1472803724-11803-7-git-send-email-peter.antoine@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472803724-11803-1-git-send-email-peter.antoine@intel.com> References: <1472803724-11803-1-git-send-email-peter.antoine@intel.com> Subject: [Intel-gfx] [PATCH v7 6/6] drm/i915/huc: Add BXT HuC Loading Support 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-Virus-Scanned: ClamAV using ClamSMTP This patch adds the HuC Loading for the BXT. Version 1.7 of the HuC firmware. v2: rebased. v3: rebased. changed file name to match the install package format. v7: rebased. Signed-off-by: Peter Antoine Reviewed-by: David Gordon --- drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c index 1aaff67..87a6948 100644 --- a/drivers/gpu/drm/i915/intel_huc_loader.c +++ b/drivers/gpu/drm/i915/intel_huc_loader.c @@ -50,6 +50,9 @@ #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin" MODULE_FIRMWARE(I915_SKL_HUC_UCODE); +#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver01_07_1398.bin" +MODULE_FIRMWARE(I915_BXT_HUC_UCODE); + /** * intel_huc_load_ucode() - DMA's the firmware * @dev: the drm device @@ -158,6 +161,10 @@ void intel_huc_init(struct drm_device *dev) fw_path = I915_SKL_HUC_UCODE; huc_fw->major_ver_wanted = 1; huc_fw->minor_ver_wanted = 7; + } else if (IS_BROXTON(dev_priv)) { + fw_path = I915_BXT_HUC_UCODE; + huc_fw->major_ver_wanted = 1; + huc_fw->minor_ver_wanted = 7; } if (fw_path == NULL)