drm/i915/GLK/HuC: Load HuC on GLK
Subsystems (2)
PATCH 1/1 drm/i915/GLK/HuC: Load HuC on GLK
Load HuC version 1.07.1748 on GLK.
v2: rebased.
v3: Use name of the right platform(John Spotswood)
--- drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_huc.c +11 -0
@@ -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 =GLK_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; }else {DRM_ERROR ("No HuC firmware known for platform with HuC!\n" );return ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/GLK/HuC: Load HuC on GLK
== Series Details ==
== Series Details ==
Series: drm/i915/GLK/HuC: Load HuC on GLK
URL : https://patchwork.freedesktop.org/series/21651/
State : success
== Summary ==
Series 21651v1 drm/i915/GLK/HuC: Load HuC on GLK
https://patchwork.freedesktop.org/api/1.0/series/21651/revisions/1/mbox/
Test gem_exec_basic:
Subgroup gtt-default:
incomplete -> PASS (fi-byt-j1900)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (fi-skl-6700hq) fdo#99739
Test kms_force_connector_basic:
Subgroup prune-stale-modes:
skip -> PASS (fi-ivb-3770)fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#99739 https://bugs.freedesktop.org/show_bug.cgi?id=99739
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 464s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 583s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 534s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 564s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 503s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 502s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 433s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 433s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 440s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 514s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 490s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 477s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 483s fi-skl-6700hq total:278 pass:260 dwarn:0 dfail:0 fail:1 skip:17 time: 586s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 489s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 519s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 549s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 418s
2382ab6f54c04989b6074de662eea2fdfff84b10 drm-tip: 2017y-03m-21d-22h-25m-56s UTC integration manifest 46022ab drm/i915/GLK/HuC: Load HuC on GLK
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4255/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 34 lines · Anusha Srivatsa
Load HuC version 1.07.1748 on GLK.
v2: rebased.
v3: Use name of the right platform(John Spotswood)Cc Jeff Mcgee <[email protected]>Cc John Spotswood <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>---
drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++1 file changed, 11 insertions(+)drivers/gpu/drm/i915/intel_huc.c +0
-0@@ -52,6 +52,10 @@ #define KBL_HUC_FW_MINOR 00 #define KBL_BLD_NUM 1810drivers/gpu/drm/i915/intel_huc.c +4
-0+#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"drivers/gpu/drm/i915/intel_huc.c +0
-0@@ -68,6 +72,9 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE); KBL_HUC_FW_MINOR, KBL_BLD_NUM) MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
drivers/gpu/drm/i915/intel_huc.c MODULE_FIRMWARE(I915_BXT_HUC_UCODE); · line 76
Quoted 2 lines
drivers/gpu/drm/i915/intel_huc.c +2
-0+#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ + GLK_HUC_FW_MINOR, GLK_BLD_NUM)
I think you need a line after this #define that says the following:
MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
Quoted 13 lines
+
/**
*huc_ucode_xfer()- DMA's the firmware
* @dev_priv: thedrm_i915_privatedevicedrivers/gpu/drm/i915/intel_huc.c +4
-0@@ -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 =GLK_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; } else {
Quoted 3 lines
DRM_ERROR("No HuC firmware known for platform with HuC!\n");
return;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 6 lines · John Spotswood
drivers/gpu/drm/i915/intel_huc.c MODULE_FIRMWARE(I915_BXT_HUC_UCODE); · line 76
Quoted 2 lines · Anusha Srivatsa
drivers/gpu/drm/i915/intel_huc.c +2
-0+#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ + GLK_HUC_FW_MINOR, GLK_BLD_NUM)I think you need a line after this #define that says the following:
MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
The rule is, we'll only add the MODULE_FIRMWARE annotation *after* the firmware blob has hit the linux-firmware repository.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoted 4 lines · Jani Nikula
Quoted 4 lines · John Spotswood
Quoted 1 line · Anusha Srivatsa
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_huc.c MODULE_FIRMWARE(I915_BXT_HUC_UCODE); · line 76
Quoted 2 lines
drivers/gpu/drm/i915/intel_huc.c +2
-0+#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ + GLK_HUC_FW_MINOR, GLK_BLD_NUM)I think you need a line after this #define that says the following:
MODULE_FIRMWARE(I915_GLK_HUC_UCODE);The rule is, we'll only add the
MODULE_FIRMWAREannotation *after* the firmware blob has hit the linux-firmware repository.
Maybe we should document the expectation here too?
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx