[PATCH 0/3] GuC, HuC Loading Support for Geminilake

[PATCH 0/3] GuC, HuC Loading Support for Geminilake

[Anusha Srivatsa]

The following changes since commit b562d2f3583f19ecda22b08e514ced57dd1e5f4d:

  linux-firmware: update wil6210 firmware to 5.2.0.18 (2018-04-16 09:55:50 -0400)

are available in the git repository at:

  https://cgit.freedesktop.org/drm/drm-firmware/ master

for you to fetch changes up to 68bc5ce062a70bbc852e782e481d69ee6d1e1635:

  linux-firmware: Add HuC v3.00.2225 for geminilake (2018-04-27 12:41:10 -0700)

----------------------------------------------------------------
Anusha Srivatsa (10):
      linux-firmware/i915: GuC firmware for Cannonlake v11.102
      linux-firmware/i915: HuC firmware for Cannonlake v9.01.2678
      Revert "linux-firmware/i915: HuC firmware for Cannonlake v9.01.2678"
      Revert "linux-firmware/i915: GuC firmware for Cannonlake v11.102"
      Merge remote-tracking branch 'official/master' into drm-firmware
      linux-firmware/i915: GuC firmware for Cannonlake v11.102
      linux-firmware/i915: HuC firmware for Cannonlake v9.01.2719
      Merge remote-tracking branch 'official/master'
      linux-firmware: Add GuC v11.98 for geminilake
      linux-firmware: Add HuC v3.00.2225 for geminilake

 WHENCE                         |   7 +++++++
 i915/glk_guc_ver11_98.bin      | Bin 0 -> 154240 bytes
 i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
 3 files changed, 7 insertions(+)
 create mode 100644 i915/glk_guc_ver11_98.bin
 create mode 100644 i915/glk_huc_ver03_00_2225.bin


Anusha Srivatsa (2):
  drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
  HAX enable guc, huc for CI

John Spotswood (1):
  drm/i915/guc: Load GuC v11.98 for Geminilake.

 drivers/gpu/drm/i915/i915_params.h  |  2 +-
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 1/3] drm/i915/guc: Load GuC v11.98 for Geminilake.

[Anusha Srivatsa]

From: John Spotswood <john.a.spotswood@intel.com>

load the v11.98 guC on geminilake.

Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: John Spotswood <john.a.spotswood@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index a9e6fcc..29b1d92 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -39,6 +39,9 @@
 #define KBL_FW_MAJOR 9
 #define KBL_FW_MINOR 39
 
+#define GLK_FW_MAJOR 11
+#define GLK_FW_MINOR 98
+
 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
 
@@ -51,6 +54,9 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)
 MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
+MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
+
 static void guc_fw_select(struct intel_uc_fw *guc_fw)
 {
 	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
@@ -77,6 +83,10 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
 		guc_fw->path = I915_KBL_GUC_UCODE;
 		guc_fw->major_ver_wanted = KBL_FW_MAJOR;
 		guc_fw->minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc_fw->path = I915_GLK_GUC_UCODE;
+		guc_fw->major_ver_wanted = GLK_FW_MAJOR;
+		guc_fw->minor_ver_wanted = GLK_FW_MINOR;
 	} else {
 		DRM_WARN("%s: No firmware known for this platform!\n",
 			 intel_uc_fw_type_repr(guc_fw->type));
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

[Anusha Srivatsa]

load the v03.00.2555 huC on geminilake.

Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index f93d238..5e96690 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -34,6 +34,10 @@
 #define KBL_HUC_FW_MINOR 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 02
+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 1810
+
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
 	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -50,6 +54,10 @@ 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)
+MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
+
 static void huc_fw_select(struct intel_uc_fw *huc_fw)
 {
 	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
@@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
 		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 = GLK_HUC_FW_MAJOR;
+		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
 		DRM_WARN("%s: No firmware known for this platform!\n",
 			 intel_uc_fw_type_repr(huc_fw->type));
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/3] HAX enable guc, huc for CI

[Anusha Srivatsa]

Enable guc loading for Geminilake.

Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index c963603..1d23c41 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,7 @@ struct drm_printer;
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc, 0) \
+	param(int, enable_guc, 2) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for GuC, HuC Loading Support for Geminilake

[Patchwork]

== Series Details ==

Series: GuC, HuC Loading Support for Geminilake
URL   : https://patchwork.freedesktop.org/series/42437/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4111 -> Patchwork_8834 =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_8834 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_8834, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/42437/revisions/1/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_8834:

  === IGT changes ===

    ==== Possible regressions ====

    igt@drv_module_reload@basic-no-display:
      fi-elk-e7500:       PASS -> DMESG-FAIL +2
      fi-ivb-3770:        PASS -> DMESG-FAIL +2
      fi-pnv-d510:        PASS -> DMESG-FAIL +2

    igt@drv_module_reload@basic-reload:
      fi-bdw-5557u:       PASS -> DMESG-FAIL +2
      fi-hsw-4200u:       PASS -> DMESG-FAIL +2
      fi-bdw-gvtdvm:      PASS -> DMESG-FAIL +2
      fi-gdg-551:         PASS -> DMESG-FAIL +2
      fi-blb-e6850:       PASS -> DMESG-FAIL +2
      fi-glk-j4005:       PASS -> DMESG-FAIL +2
      fi-ilk-650:         PASS -> DMESG-FAIL +2
      fi-bsw-n3050:       PASS -> DMESG-FAIL +2
      fi-snb-2600:        PASS -> INCOMPLETE

    igt@drv_module_reload@basic-reload-inject:
      fi-cnl-y3:          PASS -> DMESG-FAIL +2
      fi-ivb-3520m:       PASS -> DMESG-FAIL +2
      fi-hsw-4770:        PASS -> DMESG-FAIL +2
      fi-byt-n2820:       PASS -> DMESG-FAIL +2
      fi-bwr-2160:        PASS -> DMESG-FAIL +2
      fi-hsw-4770r:       PASS -> DMESG-FAIL +2

    
    ==== Warnings ====

    igt@drv_getparams_basic@basic-subslice-total:
      fi-snb-2600:        PASS -> SKIP +231

    igt@drv_hangman@error-state-basic:
      fi-elk-e7500:       PASS -> SKIP +212

    igt@drv_module_reload@basic-no-display:
      fi-cnl-psr:         DMESG-WARN (fdo#105395) -> DMESG-FAIL +2

    igt@gem_busy@basic-busy-default:
      fi-glk-j4005:       PASS -> SKIP +242

    igt@gem_close_race@basic-process:
      fi-ivb-3770:        PASS -> SKIP +238

    igt@gem_ctx_param@basic:
      fi-cnl-psr:         PASS -> SKIP +245

    igt@gem_exec_reloc@basic-cpu-active:
      fi-bsw-n3050:       PASS -> SKIP +225

    igt@gem_exec_reloc@basic-write-gtt-noreloc:
      fi-ivb-3520m:       PASS -> SKIP +241

    igt@gem_flink_basic@basic:
      fi-gdg-551:         PASS -> SKIP +162

    igt@gem_mmap_gtt@basic-read:
      fi-cnl-y3:          PASS -> SKIP +245

    igt@gem_mmap_gtt@basic-read-write-distinct:
      fi-hsw-4770:        PASS -> SKIP +244

    igt@gem_mmap_gtt@basic-wc:
      fi-pnv-d510:        PASS -> SKIP +205

    igt@gem_mmap_gtt@basic-write-gtt:
      fi-blb-e6850:       PASS -> SKIP +206

    igt@gem_sync@basic-store-all:
      fi-byt-n2820:       PASS -> SKIP +232

    igt@gem_wait@basic-busy-all:
      fi-hsw-4770r:       PASS -> SKIP +244

    igt@kms_addfb_basic@addfb25-bad-modifier:
      fi-bdw-gvtdvm:      PASS -> SKIP +247

    igt@kms_addfb_basic@too-high:
      fi-bwr-2160:        PASS -> SKIP +166

    igt@kms_addfb_basic@unused-modifier:
      fi-bdw-5557u:       PASS -> SKIP +250

    igt@kms_flip@basic-flip-vs-dpms:
      fi-ilk-650:         PASS -> SKIP +211

    igt@kms_pipe_crc_basic@read-crc-pipe-b:
      fi-hsw-4200u:       PASS -> SKIP +245

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-snb-2520m:       PASS -> SKIP +231

    
== Known issues ==

  Here are the changes found in Patchwork_8834 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_module_reload@basic-reload:
      fi-snb-2520m:       PASS -> INCOMPLETE (fdo#103713)

    
    ==== Possible fixes ====

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         FAIL (fdo#102575) -> SKIP

    igt@gem_ringfill@basic-default-hang:
      fi-pnv-d510:        DMESG-WARN (fdo#101600) -> SKIP
      fi-blb-e6850:       DMESG-WARN (fdo#101600) -> SKIP

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-ivb-3520m:       DMESG-WARN (fdo#106084) -> SKIP

    igt@kms_psr_sink_crc@psr_basic:
      fi-hsw-4200u:       FAIL (fdo#106217) -> SKIP

    
  fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
  fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
  fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
  fdo#105395 https://bugs.freedesktop.org/show_bug.cgi?id=105395
  fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084
  fdo#106217 https://bugs.freedesktop.org/show_bug.cgi?id=106217


== Participating hosts (37 -> 35) ==

  Additional (1): fi-kbl-7560u 
  Missing    (3): fi-byt-j1900 fi-ilk-m540 fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4111 -> Patchwork_8834

  CI_DRM_4111: 741ab57af83cdcc5b7faf6780c1e1c6398093f44 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4452: 29ae12bd764e3b1876356e7628a32192b4ec9066 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_8834: a48c2e7b1cb71744af571577ed1449b06ff4b68e @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4452: 04a2952c5b3782eb03cb136bb16d89daaf243f14 @ git://anongit.freedesktop.org/piglit


== Linux commits ==

a48c2e7b1cb7 HAX enable guc, huc for CI
269ab4f9b45d drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
3099f02fe298 drm/i915/guc: Load GuC v11.98 for Geminilake.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8834/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for GuC, HuC Loading Support for Geminilake

[Patchwork]

== Series Details ==

Series: GuC, HuC Loading Support for Geminilake
URL   : https://patchwork.freedesktop.org/series/42437/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4192 -> Patchwork_9016 =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_9016 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_9016, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/42437/revisions/1/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_9016:

  === IGT changes ===

    ==== Possible regressions ====

    igt@drv_module_reload@basic-no-display:
      fi-elk-e7500:       PASS -> DMESG-FAIL +2
      fi-ivb-3520m:       PASS -> DMESG-FAIL +2
      fi-pnv-d510:        PASS -> DMESG-FAIL +2
      fi-glk-j4005:       PASS -> DMESG-FAIL +2
      fi-bdw-5557u:       PASS -> DMESG-FAIL +2
      fi-hsw-peppy:       PASS -> DMESG-FAIL +2
      fi-hsw-4770r:       PASS -> DMESG-FAIL +2

    igt@drv_module_reload@basic-reload:
      fi-bdw-gvtdvm:      PASS -> DMESG-FAIL +2
      fi-gdg-551:         PASS -> DMESG-FAIL +2
      fi-hsw-4770:        PASS -> DMESG-FAIL +2
      fi-ilk-650:         PASS -> DMESG-FAIL +2
      fi-bsw-n3050:       PASS -> DMESG-FAIL +2
      fi-ivb-3770:        PASS -> DMESG-FAIL +2
      fi-blb-e6850:       PASS -> DMESG-FAIL +2
      fi-snb-2600:        PASS -> INCOMPLETE

    igt@drv_module_reload@basic-reload-inject:
      fi-byt-j1900:       PASS -> DMESG-FAIL +2
      fi-cnl-y3:          PASS -> DMESG-FAIL +2
      fi-hsw-4200u:       PASS -> DMESG-FAIL +2
      fi-byt-n2820:       PASS -> DMESG-FAIL +2
      fi-bwr-2160:        PASS -> DMESG-FAIL +2

    
    ==== Warnings ====

    igt@drv_getparams_basic@basic-subslice-total:
      fi-snb-2600:        PASS -> SKIP +231

    igt@drv_hangman@error-state-basic:
      fi-elk-e7500:       PASS -> SKIP +212

    igt@drv_module_reload@basic-no-display:
      fi-cnl-psr:         DMESG-WARN (fdo#105395) -> DMESG-FAIL +2

    igt@gem_ctx_param@basic:
      fi-cnl-psr:         PASS -> SKIP +245

    igt@gem_exec_basic@basic-blt:
      fi-ivb-3770:        PASS -> SKIP +238

    igt@gem_exec_basic@gtt-default:
      fi-byt-n2820:       PASS -> SKIP +232

    igt@gem_exec_flush@basic-uc-rw-default:
      fi-byt-j1900:       PASS -> SKIP +236

    igt@gem_exec_reloc@basic-write-gtt-noreloc:
      fi-ivb-3520m:       PASS -> SKIP +242

    igt@gem_flink_basic@bad-open:
      fi-cnl-y3:          PASS -> SKIP +245

    igt@gem_flink_basic@basic:
      fi-gdg-551:         PASS -> SKIP +162

    igt@gem_mmap_gtt@basic-read-write-distinct:
      fi-hsw-4770:        PASS -> SKIP +244

    igt@gem_mmap_gtt@basic-wc:
      fi-pnv-d510:        PASS -> SKIP +206

    igt@gem_mmap_gtt@basic-write-gtt:
      fi-blb-e6850:       PASS -> SKIP +206

    igt@gem_mmap_gtt@basic-write-read:
      fi-bwr-2160:        PASS -> SKIP +166

    igt@gem_render_linear_blits@basic:
      fi-hsw-peppy:       PASS -> SKIP +244

    igt@gem_wait@basic-busy-all:
      fi-hsw-4770r:       PASS -> SKIP +244

    igt@kms_addfb_basic@addfb25-bad-modifier:
      fi-bdw-gvtdvm:      PASS -> SKIP +247

    igt@kms_addfb_basic@too-high:
      fi-glk-j4005:       PASS -> SKIP +242

    igt@kms_addfb_basic@unused-modifier:
      fi-bdw-5557u:       PASS -> SKIP +250

    igt@kms_cursor_legacy@basic-flip-before-cursor-varying-size:
      fi-bsw-n3050:       PASS -> SKIP +225

    igt@kms_flip@basic-flip-vs-dpms:
      fi-ilk-650:         PASS -> SKIP +211

    igt@kms_pipe_crc_basic@read-crc-pipe-b:
      fi-hsw-4200u:       PASS -> SKIP +245

    
== Known issues ==

  Here are the changes found in Patchwork_9016 that come from known issues:

  === IGT changes ===

    ==== Possible fixes ====

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         FAIL (fdo#102575) -> SKIP

    igt@gem_ringfill@basic-default-hang:
      fi-blb-e6850:       DMESG-WARN (fdo#101600) -> SKIP
      fi-pnv-d510:        DMESG-WARN (fdo#101600) -> SKIP

    igt@kms_psr_sink_crc@basic:
      fi-hsw-4200u:       FAIL (fdo#106346) -> SKIP

    
  fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
  fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
  fdo#105395 https://bugs.freedesktop.org/show_bug.cgi?id=105395
  fdo#106346 https://bugs.freedesktop.org/show_bug.cgi?id=106346


== Participating hosts (42 -> 36) ==

  Missing    (6): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-ctg-p8600 fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4192 -> Patchwork_9016

  CI_DRM_4192: 302c1fbc4ca78140f408775ae39d32fc83ef0d41 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4485: eccae1360d6d01e73c6af2bd97122cef708207ef @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9016: 50cf75b13faacdd36d0d6334acc5a3f0d3de3467 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4485: 62ef6b0db8967e7021fd3e0b57d03ff164b984fe @ git://anongit.freedesktop.org/piglit


== Linux commits ==

50cf75b13faa HAX enable guc, huc for CI
7186e5849f23 drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
b67224b37abc drm/i915/guc: Load GuC v11.98 for Geminilake.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9016/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

[John Spotswood]

On Fri, 2018-04-27 at 16:33 -0700, Anusha Srivatsa wrote:
> load the v03.00.2555 huC on geminilake.
> 
> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
> Cc: Jani Saarinen <jani.saarinen@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c
> b/drivers/gpu/drm/i915/intel_huc_fw.c
> index f93d238..5e96690 100644
> --- a/drivers/gpu/drm/i915/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_huc_fw.c
> @@ -34,6 +34,10 @@
>  #define KBL_HUC_FW_MINOR 00
>  #define KBL_BLD_NUM 1810
>  
> +#define GLK_HUC_FW_MAJOR 02
> +#define GLK_HUC_FW_MINOR 00
> +#define GLK_BLD_NUM 1810

Is this version number a cut-n-paste error?  It seems to be the
version number as KBL directly above it.

> +
>  #define HUC_FW_PATH(platform, major, minor, bld_num) \
>  	"i915/" __stringify(platform) "_huc_ver" __stringify(major)
> "_" \
>  	__stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -50,6 +54,10 @@ 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)
> +MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
> +
>  static void huc_fw_select(struct intel_uc_fw *huc_fw)
>  {
>  	struct intel_huc *huc = container_of(huc_fw, struct
> intel_huc, fw);
> @@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw
> *huc_fw)
>  		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 = GLK_HUC_FW_MAJOR;
> +		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
>  	} else {
>  		DRM_WARN("%s: No firmware known for this
> platform!\n",
>  			 intel_uc_fw_type_repr(huc_fw->type));
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx