[1/8] drm/i915/firmware: Load v2.0.0 HuC for SKL
diff mbox series

Message ID 20190905183959.11102-1-anusha.srivatsa@intel.com
State New
Headers show
Series
  • [1/8] drm/i915/firmware: Load v2.0.0 HuC for SKL
Related show

Commit Message

Srivatsa, Anusha Sept. 5, 2019, 6:39 p.m. UTC
Add support to load the latest version of HuC on SKL.

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniele Ceraolo Spurio Sept. 5, 2019, 10:55 p.m. UTC | #1
Since you're changing the firmwares for all platforms, I believe this 
would be a good occasion to have the HuC blobs follow the same naming 
convention as the guc ones for consistency, i.e:

	<platform>_<g/h>uc_<major>.<minor>.<patch>.bin

A single patch to update the MAKE_HUC_FW_PATH macro and all the blob 
defs would be required for that.

Daniele

On 9/5/19 11:39 AM, Anusha Srivatsa wrote:
> Add support to load the latest version of HuC on SKL.
> 
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 296a82603be0..27482e4d7b06 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -45,7 +45,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
>   	fw_def(GEMINILAKE,  0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \
>   	fw_def(KABYLAKE,    0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
>   	fw_def(BROXTON,     0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 01,  8, 2893)) \
> -	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl, 01, 07, 1398))
> +	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl,  2,  0,    0))
>   
>   #define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \
>   	"i915/" \
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 296a82603be0..27482e4d7b06 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -45,7 +45,7 @@  void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
 	fw_def(GEMINILAKE,  0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \
 	fw_def(KABYLAKE,    0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
 	fw_def(BROXTON,     0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 01,  8, 2893)) \
-	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl, 01, 07, 1398))
+	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl,  2,  0,    0))
 
 #define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \
 	"i915/" \