From patchwork Tue Mar 21 22:40:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Spotswood X-Patchwork-Id: 9637715 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 732A860327 for ; Tue, 21 Mar 2017 22:40:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6435327C14 for ; Tue, 21 Mar 2017 22:40:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56E8328304; Tue, 21 Mar 2017 22:40:33 +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 E017D27C14 for ; Tue, 21 Mar 2017 22:40:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF2506E581; Tue, 21 Mar 2017 22:40:31 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id A203F89FF6 for ; Tue, 21 Mar 2017 22:40:30 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP; 21 Mar 2017 15:40:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,201,1486454400"; d="scan'208";a="69518972" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 21 Mar 2017 15:40:30 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Mar 2017 15:40:29 -0700 Received: from fmsmsx105.amr.corp.intel.com ([169.254.4.206]) by fmsmsx111.amr.corp.intel.com ([169.254.12.184]) with mapi id 14.03.0319.002; Tue, 21 Mar 2017 15:40:29 -0700 From: "Spotswood, John A" To: "Srivatsa, Anusha" , "intel-gfx@lists.freedesktop.org" Thread-Topic: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK Thread-Index: AQHSooewdruiZlY6FEiA1I4IHOtL9qGf4txQ Date: Tue, 21 Mar 2017 22:40:28 +0000 Message-ID: <0A048715A354F54BA270D21DECDC981D51DF9BD7@FMSMSX105.amr.corp.intel.com> References: <1490130631-3726-1-git-send-email-anusha.srivatsa@intel.com> <1490130631-3726-2-git-send-email-anusha.srivatsa@intel.com> In-Reply-To: <1490130631-3726-2-git-send-email-anusha.srivatsa@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTk4ODEzYmYtOWIwZS00NTc4LTkwZjMtMDMzNzIyNTYxN2Q4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IllcL2VQaG8wb2V6ckFQZWxNK0tFSmdhSFEwWU83S3NhdUV4WW1UcVVzcVo0PSJ9 x-originating-ip: [10.1.200.107] MIME-Version: 1.0 Cc: "Vivi, Rodrigo" Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP In Hunk #3 at lines 174 and 175, you are still referencing KBL_HUC_FW_MAJOR and KBL_HUC_FW_MINOR instead of GLK_HUC_FW_MAJOR and GLK_HUC_FW_MINOR. John -----Original Message----- From: Srivatsa, Anusha Sent: Tuesday, March 21, 2017 2:11 PM To: intel-gfx@lists.freedesktop.org Cc: Srivatsa, Anusha ; Mcgee, Jeff ; Spotswood, John A ; Vivi, Rodrigo Subject: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK Load HuC version 1.07.1748 on GLK. Cc: Jeff Mcgee Cc: John Spotswood Cc: Rodrigo Vivi Signed-off-by: Anusha Srivatsa --- drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index 7af900b..8dfb917 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -52,6 +52,10 @@ #define KBL_HUC_FW_MINOR 00 #define KBL_BLD_NUM 1810 +#define GLK_HUC_FW_MAJOR 01 +#define GLK_HUC_FW_MINOR 07 +#define GLK_BLD_NUM 1748 + #define HUC_FW_PATH(platform, major, minor, bld_num) \ "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ __stringify(minor) "_" __stringify(bld_num) ".bin" @@ -68,6 +72,9 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE); KBL_HUC_FW_MINOR, KBL_BLD_NUM) MODULE_FIRMWARE(I915_KBL_HUC_UCODE); +#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ + GLK_HUC_FW_MINOR, GLK_BLD_NUM) + /** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm_i915_private device @@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.path = I915_KBL_HUC_UCODE; huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR; huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR; + } else if (IS_GEMINILAKE(dev_priv)) { + huc->fw.path = I915_GLK_HUC_UCODE; + huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR; + huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR; } else { DRM_ERROR("No HuC firmware known for platform with HuC!\n"); return;