* [PATCH 0/2] HuC updates
@ 2019-09-09 19:27 Anusha Srivatsa
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-09-09 19:27 UTC (permalink / raw)
To: intel-gfx
linux-firmware: Update firmware file for Intel Bluetooth AX201 (2019-09-09 04:22:42 -0400)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-firmware ehl_huc
for you to fetch changes up to 44a6d7e577ca3df16d804c560de16cb8483c4306:
i915: Add HuC firmware v9.0.0 for EHL (2019-09-09 12:19:42 -0700)
----------------------------------------------------------------
Daniele Ceraolo Spurio (1):
i915: Add HuC firmware v9.0.0 for EHL
WHENCE | 3 +++
i915/ehl_huc_9.0.0.bin | Bin 0 -> 498880 bytes
2 files changed, 3 insertions(+)
create mode 100644 i915/ehl_huc_9.0.0.bin
anusha@anusha:~/drm-firmware$ tsocks git push origin ehl_huc
Enumerating objects: 12, done.
Counting objects: 100% (12/12), done.
Delta compression using up to 4 threads
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 153.31 KiB | 76.65 MiB/s, done.
Total 8 (delta 5), reused 1 (delta 0)
To ssh://git.freedesktop.org/git/drm/drm-firmware
* [new branch] ehl_huc -> ehl_huc
Anusha Srivatsa (2):
drm/i915/uc: Update MAKE_HUC_FW_PATH macro
HAX: force enable_guc=2
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 25 ++++++++++++------------
drivers/gpu/drm/i915/i915_params.h | 2 +-
2 files changed, 14 insertions(+), 13 deletions(-)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
@ 2019-09-09 19:28 ` Anusha Srivatsa
2019-09-10 9:52 ` Michal Wajdeczko
2019-09-10 21:05 ` Daniele Ceraolo Spurio
2019-09-09 19:28 ` [PATCH 2/2] HAX: force enable_guc=2 Anusha Srivatsa
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-09-09 19:28 UTC (permalink / raw)
To: intel-gfx
Update MAKE_HUC_FW_PATH macro to follow the same convention
as the MAKE_GUC_FW_PATH with the separator changing from "_" to "."
and removing "ver".
The current convention being:
<platform>_<g/h>uc_<major>.<minor>.patch.bin
Update the versions of huc being loaded of the platforms.
SKL - v2.0.0
BXT - v2.0.0
KBL - v4.0.0
GLK - v4.0.0
CFL - KBL v4.0.0
ICL - v9.0.0
CML - v4.0.0
v2: Remove the separator parameter altogether from
__MAKE_UC_FW_PATH.(Daniele)
- Squash all firmware update patches (Daniele)
Suggested-by: 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 | 25 ++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
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..da4bf24368bd 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
*/
#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \
- fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
- fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
- 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))
-
-#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \
+ fw_def(COFFEELAKE, 0, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \
+ fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
+ fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
+ fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \
+ fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
+ fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \
+ fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0))
+
+#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
"i915/" \
__stringify(prefix_) name_ \
- __stringify(major_) separator_ \
- __stringify(minor_) separator_ \
+ __stringify(major_) "." \
+ __stringify(minor_) "." \
__stringify(patch_) ".bin"
#define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \
- __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)
+ __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)
#define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \
- __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_)
+ __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)
/* All blobs need to be declared via MODULE_FIRMWARE() */
#define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] HAX: force enable_guc=2
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
@ 2019-09-09 19:28 ` Anusha Srivatsa
2019-09-09 21:00 ` ✗ Fi.CI.CHECKPATCH: warning for HuC updates (rev3) Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-09-09 19:28 UTC (permalink / raw)
To: intel-gfx
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 d29ade3b7de6..f9fbb1f2fabf 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -54,7 +54,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.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for HuC updates (rev3)
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
2019-09-09 19:28 ` [PATCH 2/2] HAX: force enable_guc=2 Anusha Srivatsa
@ 2019-09-09 21:00 ` Patchwork
2019-09-09 21:28 ` ✓ Fi.CI.BAT: success " Patchwork
2019-09-10 6:59 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-09-09 21:00 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: HuC updates (rev3)
URL : https://patchwork.freedesktop.org/series/66361/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
3e2f37ffcdcc drm/i915/uc: Update MAKE_HUC_FW_PATH macro
81ceadb0ec8e HAX: force enable_guc=2
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 8 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✓ Fi.CI.BAT: success for HuC updates (rev3)
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
` (2 preceding siblings ...)
2019-09-09 21:00 ` ✗ Fi.CI.CHECKPATCH: warning for HuC updates (rev3) Patchwork
@ 2019-09-09 21:28 ` Patchwork
2019-09-10 6:59 ` ✓ Fi.CI.IGT: " Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-09-09 21:28 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: HuC updates (rev3)
URL : https://patchwork.freedesktop.org/series/66361/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6854 -> Patchwork_14333
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/
Known issues
------------
Here are the changes found in Patchwork_14333 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_ctx_switch@legacy-render:
- fi-icl-u2: [INCOMPLETE][1] ([fdo#107713] / [fdo#111381]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/fi-icl-u2/igt@gem_ctx_switch@legacy-render.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/fi-icl-u2/igt@gem_ctx_switch@legacy-render.html
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
Participating hosts (51 -> 46)
------------------------------
Additional (3): fi-icl-dsi fi-cfl-guc fi-icl-u3
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6854 -> Patchwork_14333
CI-20190529: 20190529
CI_DRM_6854: 5a70800ed2837e2d35a331e2cfd43a55df58c4fc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5176: 0102dcf4e2e8b357b59173fe1ff78069148080c6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14333: 81ceadb0ec8ef31e8152821f28eb261721af9274 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
81ceadb0ec8e HAX: force enable_guc=2
3e2f37ffcdcc drm/i915/uc: Update MAKE_HUC_FW_PATH macro
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✓ Fi.CI.IGT: success for HuC updates (rev3)
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
` (3 preceding siblings ...)
2019-09-09 21:28 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-09-10 6:59 ` Patchwork
4 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-09-10 6:59 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: HuC updates (rev3)
URL : https://patchwork.freedesktop.org/series/66361/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6854_full -> Patchwork_14333_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14333_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276]) +14 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb1/igt@gem_exec_schedule@preempt-queue-bsd1.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb6/igt@gem_exec_schedule@preempt-queue-bsd1.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#111325]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb5/igt@gem_exec_schedule@preemptive-hang-bsd.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb2/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [PASS][5] -> [DMESG-WARN][6] ([fdo#108686])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-glk7/igt@gem_tiled_swapping@non-threaded.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-glk5/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_workarounds@suspend-resume-fd:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#104108])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-skl8/igt@gem_workarounds@suspend-resume-fd.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-skl7/igt@gem_workarounds@suspend-resume-fd.html
* igt@i915_suspend@fence-restore-untiled:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-apl4/igt@i915_suspend@fence-restore-untiled.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-apl3/igt@i915_suspend@fence-restore-untiled.html
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [PASS][11] -> [FAIL][12] ([fdo#103355])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-hsw7/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-hsw8/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [PASS][13] -> [FAIL][14] ([fdo#105363])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-glk6/igt@kms_flip@flip-vs-expired-vblank.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-glk1/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [PASS][15] -> [INCOMPLETE][16] ([fdo#109507])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-skl3/igt@kms_flip@flip-vs-suspend.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-skl4/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103167]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][19] -> [INCOMPLETE][20] ([fdo#106978] / [fdo#107713])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#109642] / [fdo#111068])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb2/igt@kms_psr2_su@frontbuffer.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb3/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
#### Possible fixes ####
* igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [SKIP][25] ([fdo#111325]) -> [PASS][26] +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb4/igt@gem_exec_async@concurrent-writes-bsd.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb5/igt@gem_exec_async@concurrent-writes-bsd.html
* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [SKIP][27] ([fdo#109276]) -> [PASS][28] +10 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb5/igt@gem_exec_schedule@promotion-bsd1.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb4/igt@gem_exec_schedule@promotion-bsd1.html
* igt@gem_fence_thrash@bo-write-verify-threaded-x:
- shard-apl: [INCOMPLETE][29] ([fdo#103927]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-apl4/igt@gem_fence_thrash@bo-write-verify-threaded-x.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-apl8/igt@gem_fence_thrash@bo-write-verify-threaded-x.html
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][31] ([fdo#108566]) -> [PASS][32] +7 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-apl8/igt@i915_suspend@sysfs-reader.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-apl4/igt@i915_suspend@sysfs-reader.html
* igt@kms_cursor_crc@pipe-c-cursor-256x85-offscreen:
- shard-iclb: [INCOMPLETE][33] ([fdo#107713]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb7/igt@kms_cursor_crc@pipe-c-cursor-256x85-offscreen.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb4/igt@kms_cursor_crc@pipe-c-cursor-256x85-offscreen.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][35] ([fdo#105363]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-skl6/igt@kms_flip@flip-vs-expired-vblank.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-skl2/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-snb: [INCOMPLETE][37] ([fdo#105411]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-snb1/igt@kms_flip@flip-vs-suspend-interruptible.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-snb5/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [FAIL][39] ([fdo#103167]) -> [PASS][40] +2 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-rte:
- shard-iclb: [FAIL][41] ([fdo#103167] / [fdo#110378]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-rte.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-rte.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- shard-kbl: [INCOMPLETE][43] ([fdo#103665]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-kbl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-kbl1/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c.html
* igt@kms_psr@psr2_basic:
- shard-iclb: [SKIP][45] ([fdo#109441]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb8/igt@kms_psr@psr2_basic.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb2/igt@kms_psr@psr2_basic.html
* igt@kms_rotation_crc@primary-y-tiled-reflect-x-90:
- shard-iclb: [INCOMPLETE][47] ([fdo#107713] / [fdo#110026] / [fdo#110040 ]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb1/igt@kms_rotation_crc@primary-y-tiled-reflect-x-90.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb7/igt@kms_rotation_crc@primary-y-tiled-reflect-x-90.html
* igt@perf@polling:
- shard-skl: [FAIL][49] ([fdo#110728]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-skl6/igt@perf@polling.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-skl2/igt@perf@polling.html
#### Warnings ####
* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [SKIP][51] ([fdo#109276]) -> [FAIL][52] ([fdo#111330]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6854/shard-iclb5/igt@gem_mocs_settings@mocs-reset-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110026]: https://bugs.freedesktop.org/show_bug.cgi?id=110026
[fdo#110040 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110040
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6854 -> Patchwork_14333
CI-20190529: 20190529
CI_DRM_6854: 5a70800ed2837e2d35a331e2cfd43a55df58c4fc @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5176: 0102dcf4e2e8b357b59173fe1ff78069148080c6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14333: 81ceadb0ec8ef31e8152821f28eb261721af9274 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
@ 2019-09-10 9:52 ` Michal Wajdeczko
2019-09-10 21:05 ` Daniele Ceraolo Spurio
1 sibling, 0 replies; 11+ messages in thread
From: Michal Wajdeczko @ 2019-09-10 9:52 UTC (permalink / raw)
To: intel-gfx, Anusha Srivatsa
On Mon, 09 Sep 2019 21:28:00 +0200, Anusha Srivatsa
<anusha.srivatsa@intel.com> wrote:
> Update MAKE_HUC_FW_PATH macro to follow the same convention
> as the MAKE_GUC_FW_PATH with the separator changing from "_" to "."
> and removing "ver".
above commit message (and patch title) is little misleading as updating
a macro is secondary compared to introduced new firmware naming convention
>
> The current convention being:
> <platform>_<g/h>uc_<major>.<minor>.patch.bin
>
> Update the versions of huc being loaded of the platforms.
s/huc/HuC
>
> SKL - v2.0.0
> BXT - v2.0.0
> KBL - v4.0.0
> GLK - v4.0.0
> CFL - KBL v4.0.0
> ICL - v9.0.0
> CML - v4.0.0
>
> v2: Remove the separator parameter altogether from
> __MAKE_UC_FW_PATH.(Daniele)
> - Squash all firmware update patches (Daniele)
>
> Suggested-by: 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 | 25 ++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> 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..da4bf24368bd 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw
> *uc_fw,
> */
> #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
> fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0,
> 0)) \
> - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4,
> 3238)) \
> - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00,
> 1810)) \
> - 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))
> -
> -#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_,
> patch_) \
> + fw_def(COFFEELAKE, 0, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0,
> 0)) \
this is wrong, CML is CFL rev 5, for reference see [1]
and macro ordering is also wrong (already detected by our code, yeah!):
<3> [321.487555] invalid FW blob order: COFFEELAKE r0 comes before ICELAKE
r0
and this wrong ordering leads to:
<7> [321.487616] i915 0000:00:02.0: [drm:intel_uc_init_early [i915]]
enable_guc=2 (guc:no submission:no huc:no)
<6> [321.487618] i915 0000:00:02.0: Incompatible option enable_guc=2 - GuC
is not supported!
<6> [321.487620] i915 0000:00:02.0: Incompatible option enable_guc=2 - HuC
is not supported!
see [2] for details
[1] https://patchwork.freedesktop.org/patch/319864/?series=62969&rev=5
[2]
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14333/fi-cml-u2/igt@i915_module_load@reload-with-fault-injection.html
> + fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0,
> 0)) \
> + fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0,
> 0)) \
> + fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0,
> 0)) \
> + fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0,
> 0)) \
> + fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0,
> 0)) \
> + fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0,
> 0))
> +
> +#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
> "i915/" \
> __stringify(prefix_) name_ \
> - __stringify(major_) separator_ \
> - __stringify(minor_) separator_ \
> + __stringify(major_) "." \
> + __stringify(minor_) "." \
> __stringify(patch_) ".bin"
> #define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \
> - __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)
> + __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)
> #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \
> - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_)
> + __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)
> /* All blobs need to be declared via MODULE_FIRMWARE() */
> #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
2019-09-10 9:52 ` Michal Wajdeczko
@ 2019-09-10 21:05 ` Daniele Ceraolo Spurio
2019-09-10 21:35 ` Srivatsa, Anusha
1 sibling, 1 reply; 11+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-09-10 21:05 UTC (permalink / raw)
To: Anusha Srivatsa, intel-gfx
On 9/9/19 12:28 PM, Anusha Srivatsa wrote:
> Update MAKE_HUC_FW_PATH macro to follow the same convention
> as the MAKE_GUC_FW_PATH with the separator changing from "_" to "."
> and removing "ver".
>
> The current convention being:
> <platform>_<g/h>uc_<major>.<minor>.patch.bin
>
> Update the versions of huc being loaded of the platforms.
>
> SKL - v2.0.0
> BXT - v2.0.0
> KBL - v4.0.0
> GLK - v4.0.0
> CFL - KBL v4.0.0
> ICL - v9.0.0
> CML - v4.0.0
>
> v2: Remove the separator parameter altogether from
> __MAKE_UC_FW_PATH.(Daniele)
> - Squash all firmware update patches (Daniele)
>
> Suggested-by: 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 | 25 ++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> 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..da4bf24368bd 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
> */
> #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
> fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \
> - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
> - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \
> - 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))
> -
> -#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \
> + fw_def(COFFEELAKE, 0, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \
> + fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
> + fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
> + fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \
> + fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
> + fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \
> + fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0))
In addition to what Michal pointed out, while we're at it you can also
get rid of all the extra spaces in the huc_def() column since we've now
standardized the length of the items like we did with GuC. Maybe just
leave an extra space for the major, since we're close to hitting v10?
Daniele
> +
> +#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
> "i915/" \
> __stringify(prefix_) name_ \
> - __stringify(major_) separator_ \
> - __stringify(minor_) separator_ \
> + __stringify(major_) "." \
> + __stringify(minor_) "." \
> __stringify(patch_) ".bin"
>
> #define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \
> - __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)
> + __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)
>
> #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \
> - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_)
> + __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)
>
> /* All blobs need to be declared via MODULE_FIRMWARE() */
> #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
2019-09-10 21:05 ` Daniele Ceraolo Spurio
@ 2019-09-10 21:35 ` Srivatsa, Anusha
2019-09-10 21:37 ` Daniele Ceraolo Spurio
0 siblings, 1 reply; 11+ messages in thread
From: Srivatsa, Anusha @ 2019-09-10 21:35 UTC (permalink / raw)
To: Ceraolo Spurio, Daniele, intel-gfx
> -----Original Message-----
> From: Ceraolo Spurio, Daniele
> Sent: Tuesday, September 10, 2019 2:05 PM
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
>
>
>
> On 9/9/19 12:28 PM, Anusha Srivatsa wrote:
> > Update MAKE_HUC_FW_PATH macro to follow the same convention as the
> > MAKE_GUC_FW_PATH with the separator changing from "_" to "."
> > and removing "ver".
> >
> > The current convention being:
> > <platform>_<g/h>uc_<major>.<minor>.patch.bin
> >
> > Update the versions of huc being loaded of the platforms.
> >
> > SKL - v2.0.0
> > BXT - v2.0.0
> > KBL - v4.0.0
> > GLK - v4.0.0
> > CFL - KBL v4.0.0
> > ICL - v9.0.0
> > CML - v4.0.0
> >
> > v2: Remove the separator parameter altogether from
> > __MAKE_UC_FW_PATH.(Daniele)
> > - Squash all firmware update patches (Daniele)
> >
> > Suggested-by: 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 | 25 ++++++++++++------------
> > 1 file changed, 13 insertions(+), 12 deletions(-)
> >
> > 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..da4bf24368bd 100644
> > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> > @@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw
> *uc_fw,
> > */
> > #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
> > fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0))
> \
> > - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
> > - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00,
> 1810)) \
> > - 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))
> > -
> > -#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_,
> > patch_) \
> > + fw_def(COFFEELAKE, 0, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0))
> \
> > + fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
> > + fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
> > + fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \
> > + fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
> > + fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \
> > + fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0))
>
> In addition to what Michal pointed out, while we're at it you can also get rid of
> all the extra spaces in the huc_def() column since we've now standardized the
> length of the items like we did with GuC. Maybe just leave an extra space for the
> major, since we're close to hitting v10?
Regarding that, do we still want 4 spaces for HuC build number?
And 2 spaces for minor?
Anusha
> Daniele
>
> > +
> > +#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
> > "i915/" \
> > __stringify(prefix_) name_ \
> > - __stringify(major_) separator_ \
> > - __stringify(minor_) separator_ \
> > + __stringify(major_) "." \
> > + __stringify(minor_) "." \
> > __stringify(patch_) ".bin"
> >
> > #define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \
> > - __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)
> > + __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)
> >
> > #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \
> > - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_,
> bld_num_)
> > + __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)
> >
> > /* All blobs need to be declared via MODULE_FIRMWARE() */
> > #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
> >
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
2019-09-10 21:35 ` Srivatsa, Anusha
@ 2019-09-10 21:37 ` Daniele Ceraolo Spurio
0 siblings, 0 replies; 11+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-09-10 21:37 UTC (permalink / raw)
To: Srivatsa, Anusha, intel-gfx
On 9/10/19 2:35 PM, Srivatsa, Anusha wrote:
>
>
>> -----Original Message-----
>> From: Ceraolo Spurio, Daniele
>> Sent: Tuesday, September 10, 2019 2:05 PM
>> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
>> gfx@lists.freedesktop.org
>> Subject: Re: [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro
>>
>>
>>
>> On 9/9/19 12:28 PM, Anusha Srivatsa wrote:
>>> Update MAKE_HUC_FW_PATH macro to follow the same convention as the
>>> MAKE_GUC_FW_PATH with the separator changing from "_" to "."
>>> and removing "ver".
>>>
>>> The current convention being:
>>> <platform>_<g/h>uc_<major>.<minor>.patch.bin
>>>
>>> Update the versions of huc being loaded of the platforms.
>>>
>>> SKL - v2.0.0
>>> BXT - v2.0.0
>>> KBL - v4.0.0
>>> GLK - v4.0.0
>>> CFL - KBL v4.0.0
>>> ICL - v9.0.0
>>> CML - v4.0.0
>>>
>>> v2: Remove the separator parameter altogether from
>>> __MAKE_UC_FW_PATH.(Daniele)
>>> - Squash all firmware update patches (Daniele)
>>>
>>> Suggested-by: 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 | 25 ++++++++++++------------
>>> 1 file changed, 13 insertions(+), 12 deletions(-)
>>>
>>> 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..da4bf24368bd 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw
>> *uc_fw,
>>> */
>>> #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
>>> fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0))
>> \
>>> - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \
>>> - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00,
>> 1810)) \
>>> - 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))
>>> -
>>> -#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_,
>>> patch_) \
>>> + fw_def(COFFEELAKE, 0, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0))
>> \
>>> + fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \
>>> + fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
>>> + fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \
>>> + fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \
>>> + fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \
>>> + fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0))
>>
>> In addition to what Michal pointed out, while we're at it you can also get rid of
>> all the extra spaces in the huc_def() column since we've now standardized the
>> length of the items like we did with GuC. Maybe just leave an extra space for the
>> major, since we're close to hitting v10?
>
> Regarding that, do we still want 4 spaces for HuC build number?
> And 2 spaces for minor?
No, just leave 1 space for minor and build num (like for guc_def) and 2
for the major so we don't have to move everything when we get HuC v10
Daniele
>
> Anusha
>> Daniele
>>
>>> +
>>> +#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
>>> "i915/" \
>>> __stringify(prefix_) name_ \
>>> - __stringify(major_) separator_ \
>>> - __stringify(minor_) separator_ \
>>> + __stringify(major_) "." \
>>> + __stringify(minor_) "." \
>>> __stringify(patch_) ".bin"
>>>
>>> #define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \
>>> - __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)
>>> + __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)
>>>
>>> #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \
>>> - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_,
>> bld_num_)
>>> + __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)
>>>
>>> /* All blobs need to be declared via MODULE_FIRMWARE() */
>>> #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \
>>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] HuC Updates
@ 2019-09-10 22:42 Anusha Srivatsa
0 siblings, 0 replies; 11+ messages in thread
From: Anusha Srivatsa @ 2019-09-10 22:42 UTC (permalink / raw)
To: intel-gfx
The following changes since commit 6c6918ad8ae0dfb2cb591484eba525409980c16f:
linux-firmware: Update firmware file for Intel Bluetooth AX201 (2019-09-09 04:22:42 -0400)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-firmware ehl_huc
for you to fetch changes up to 44a6d7e577ca3df16d804c560de16cb8483c4306:
i915: Add HuC firmware v9.0.0 for EHL (2019-09-09 12:19:42 -0700)
----------------------------------------------------------------
Daniele Ceraolo Spurio (1):
i915: Add HuC firmware v9.0.0 for EHL
WHENCE | 3 +++
i915/ehl_huc_9.0.0.bin | Bin 0 -> 498880 bytes
2 files changed, 3 insertions(+)
create mode 100644 i915/ehl_huc_9.0.0.bin
Anusha Srivatsa (2):
drm/i915/uc: Update GuC and HuC firmware naming convention
HAX: force enable_guc=2
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 27 ++++++++++++------------
drivers/gpu/drm/i915/i915_params.h | 2 +-
2 files changed, 15 insertions(+), 14 deletions(-)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-09-10 22:52 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-09 19:27 [PATCH 0/2] HuC updates Anusha Srivatsa
2019-09-09 19:28 ` [PATCH 1/2] drm/i915/uc: Update MAKE_HUC_FW_PATH macro Anusha Srivatsa
2019-09-10 9:52 ` Michal Wajdeczko
2019-09-10 21:05 ` Daniele Ceraolo Spurio
2019-09-10 21:35 ` Srivatsa, Anusha
2019-09-10 21:37 ` Daniele Ceraolo Spurio
2019-09-09 19:28 ` [PATCH 2/2] HAX: force enable_guc=2 Anusha Srivatsa
2019-09-09 21:00 ` ✗ Fi.CI.CHECKPATCH: warning for HuC updates (rev3) Patchwork
2019-09-09 21:28 ` ✓ Fi.CI.BAT: success " Patchwork
2019-09-10 6:59 ` ✓ Fi.CI.IGT: " Patchwork
2019-09-10 22:42 [PATCH 0/2] HuC Updates Anusha Srivatsa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.