Skip to contentSkip to conversation

Load Guc and huC on Geminilake

PATCH New Anusha Srivatsa 2 participants 6 messages May 24, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Load Guc and huC on Geminilake

The following changes since commit 2a9b2cf50fb32e36e4fc1586c2f6f1421913b553:

Merge branch 'for-upstreaming-v1.7.2' of https://github.com/felix-cavium/linux-firmware (2018-05-18 08:35:22 -0400)

are available in the git repository at:

git://anongit.freedesktop.org/drm/drm-firmware master

for you to fetch changes up to e2d61f2778f808d4c4ad1b860e0ad8fe871eccc3:

Merge remote-tracking branch 'official/master' (2018-05-22 21:57:10 -0700)

----------------------------------------------------------------
Anusha Srivatsa (12):
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
Revert "linux-firmware/i915: GuC firmware for Cannonlake v11.102" Revert "linux-firmware/i915: HuC firmware for Cannonlake v9.01.2719" Merge remote-tracking branch 'official/master'

 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.2225 for Geminilake. Enable guc loading for Geminilake.

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(-)
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

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

From: John Spotswood <[email protected]>

load the v11.98 guC on geminilake.

v2: rebased.

---
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/gpu/drm/i915/intel_guc_fw.c +10 -0
index a9e6fcc..29b1d92 100644
@@ -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));
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 2/3 drm/i915/huc: Load HuC v03.00.2225 for Geminilake.

In reply to Anusha Srivatsa

load the v03.00.2225 huC on geminilake.

v2:
- rebased.
- Load the correct the version. (John Spotswood) v3:
- rebased.

Cc John Spotswood <[email protected]>
Cc Tomi Sarvela <[email protected]>
Cc Jani Saarinen <[email protected]>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/gpu/drm/i915/intel_huc_fw.c +12 -0
index f93d238..b8efbff 100644
@@ -34,6 +34,10 @@
 #define KBL_HUC_FW_MINOR 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 03
+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 2225
+
 #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));
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH 3/3 Enable guc loading for Geminilake.

In reply to Anusha Srivatsa
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
index aebe046..3e4e128 100644
@@ -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, -1) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

✓ Fi.CI.BAT: success for Load Guc and huC on Geminilake

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: Load Guc and huC on Geminilake
URL : https://patchwork.freedesktop.org/series/43669/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4227 -> Patchwork_9101 =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_9101 need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9101, 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/43669/revisions/1/mbox/

== Possible new issues ==

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

=== IGT changes ===

    ==== Warnings ====

    igt@gem_exec_gttfill@basic:
      fi-pnv-d510:        SKIP -> PASS

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-4200u:       PASS -> DMESG-FAIL (fdo#106103, fdo#102614)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-snb-2520m:       PASS -> INCOMPLETE (fdo#103713)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      fi-bxt-dsi:         PASS -> INCOMPLETE (fdo#103927)

    
    ==== Possible fixes ====

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

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-hsw-4770:        FAIL (fdo#100368) -> PASS

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103

== Participating hosts (44 -> 38) ==

Missing (6): fi-ilk-m540 fi-cnl-y3 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-6700hq

== Build changes ==

* Linux: CI_DRM_4227 -> Patchwork_9101

CI_DRM_4227: a8727d3fe03770e4d523468dfbc487dfe01597d3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4495: 71c7a5740913d2618f44bca252669efe8a84f4c9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9101: 53df508ebd8a1a81050fa8fc842dcf06ed690974 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4495: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Linux commits ==

53df508ebd8a Enable guc loading for Geminilake. e574a6138742 drm/i915/huc: Load HuC v03.00.2225 for Geminilake. 35c75d409b52 drm/i915/guc: Load GuC v11.98 for Geminilake.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9101/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.IGT: failure for Load Guc and huC on Geminilake

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: Load Guc and huC on Geminilake
URL : https://patchwork.freedesktop.org/series/43669/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4227_full -> Patchwork_9101_full =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_9101_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9101_full, 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/43669/revisions/1/mbox/

== Possible new issues ==

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

=== IGT changes ===

    ==== Possible regressions ====

    igt@debugfs_test@read_all_entries:
      shard-glk:          PASS -> DMESG-WARN +2

    igt@drv_selftest@live_hangcheck:
      shard-kbl:          PASS -> DMESG-FAIL +1
      shard-apl:          PASS -> DMESG-FAIL +1

    igt@perf@gen8-unprivileged-single-ctx-counters:
      shard-apl:          PASS -> FAIL
      shard-glk:          PASS -> FAIL

    igt@pm_rpm@debugfs-read:
      shard-apl:          PASS -> DMESG-WARN

    igt@prime_busy@hang-vebox:
      shard-kbl:          PASS -> DMESG-WARN +1

    igt@prime_busy@wait-hang-render:
      shard-kbl:          PASS -> FAIL +1

    
    ==== Warnings ====

    igt@drv_missed_irq:
      shard-apl:          PASS -> SKIP
      shard-glk:          PASS -> SKIP

    igt@perf_pmu@multi-client-rcs0:
      shard-kbl:          PASS -> SKIP +14

    igt@perf_pmu@rc6:
      shard-kbl:          SKIP -> PASS

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_suspend@debugfs-reader:
      shard-kbl:          PASS -> DMESG-WARN (fdo#103313)

    igt@gem_eio@execbuf:
      shard-glk:          PASS -> INCOMPLETE (fdo#103359, k.org#198133) +2
      shard-apl:          PASS -> INCOMPLETE (fdo#103927) +1

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-glk:          PASS -> FAIL (fdo#104724, fdo#103822)

    igt@prime_busy@wait-hang-vebox:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665) +5

    
    ==== Possible fixes ====

    igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
      shard-glk:          FAIL (fdo#105703) -> PASS

    igt@kms_flip@2x-flip-vs-expired-vblank:
      shard-glk:          FAIL (fdo#105707) -> PASS

    igt@kms_flip@2x-plain-flip-fb-recreate:
      shard-hsw:          FAIL (fdo#100368) -> PASS

    igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible:
      shard-hsw:          FAIL (fdo#103928) -> PASS

    igt@kms_flip@plain-flip-fb-recreate-interruptible:
      shard-glk:          FAIL (fdo#100368) -> PASS +1

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
fdo#105707 https://bugs.freedesktop.org/show_bug.cgi?id=105707
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4227 -> Patchwork_9101

CI_DRM_4227: a8727d3fe03770e4d523468dfbc487dfe01597d3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4495: 71c7a5740913d2618f44bca252669efe8a84f4c9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9101: 53df508ebd8a1a81050fa8fc842dcf06ed690974 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4495: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9101/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx