drm/i915/GuC/GLK: Load GuC on GLK
Subsystems (2)
PATCH 1/2 drm/i915/GuC/GLK: Load GuC on GLK
Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing has not been done yet. This patch addresses the initial need to load the GuC firmware for HuC authentication
v2: rebased.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +9 -0
@@ -61,6 +61,9 @@#define KBL_FW_MAJOR 9#define KBL_FW_MINOR 14 +#define GLK_FW_MAJOR 10 +#define GLK_FW_MINOR 56 +#define GUC_FW_PATH (platform, major, minor) \ "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
@@ -73,6 +76,8 @@ 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) +/* User-friendly representation of an enum */ const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status) {
@@ -421,6 +426,10 @@ int intel_guc_select_fw(struct intel_guc *guc) 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_ERROR ("No GuC firmware known for platform with GuC!\n" );return -ENOENT ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 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)
v4: rebased.
--- 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
Re: [PATCH 2/2] drm/i915/GLK/HuC: Load HuC on GLK
Quoted 10 lines · Anusha Srivatsa
Load HuC version 1.07.1748 on GLK.
v2: rebased.
v3: Use name of the right platform(John Spotswood)
v4: rebased.Cc Jeff Mcgee <[email protected]>Cc John Spotswood <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>
Quoted 40 lines
---
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 +3
-0+#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: 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
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
URL : https://patchwork.freedesktop.org/series/22237/
State : success
== Summary ==
Series 22237v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22237/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-kbl-7560u) fdo#100125fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 427s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 425s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 568s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 507s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 547s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 487s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 490s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 409s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 404s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 422s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 482s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 469s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 451s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time: 570s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 455s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 578s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 457s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 488s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 434s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 530s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 408s
d217cd61ada383a577dc686dd74f77856695ec84 drm-tip: 2017y-03m-30d-18h-24m-46s UTC integration manifest 3362b59 drm/i915/GLK/HuC: Load HuC on GLK
1657e54 drm/i915/GuC/GLK: Load GuC on GLK
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4368/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ander Conselvan De Oliveira
AppliedRe: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
Quoted 5 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
URL : https://patchwork.freedesktop.org/series/22237/
State : success
Pushed to dinq. Thanks for the patches and reviews!
Ander
Quoted 38 lines
== Summary ==
Series 22237v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22237/revisions/1/mbox/Test
gem_exec_suspend:Subgroup basic-s4-devices: pass -> DMESG-WARN (fi-kbl-7560u) fdo#100125fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 427s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 425s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 568s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 507s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 547s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 487s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 490s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 409s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 404s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 422s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 482s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 469s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 451s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time: 570s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 455s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 578s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 457s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 488s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 434s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 530s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 408s
d217cd61ada383a577dc686dd74f77856695ec84drm-tip: 2017y-03m-30d-18h-24m-46s UTC integration manifest 3362b59 drm/i915/GLK/HuC: Load HuC on GLK
1657e54 drm/i915/GuC/GLK: Load GuC on GLK
Quoted 7 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4368/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Anusha Srivatsa
Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing has not been done yet. This patch addresses the initial need to load the GuC firmware for HuC authentication
v2: rebased.
Cc Jeff mcgee <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc John Spotswood <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>
Quoted 40 lines
---
drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++1 file changed, 9 insertions(+)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -61,6 +61,9 @@ #define KBL_FW_MAJOR 9 #define KBL_FW_MINOR 14drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+#define GLK_FW_MAJOR 10 +#define GLK_FW_MINOR 56 +#define
GUC_FW_PATH(platform, major, minor)\
"i915/"__stringify(platform)"_guc_ver"__stringify(major)"_"__stringify(minor)".bin"drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -73,6 +76,8 @@ 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);
+#defineI915_GLK_GUC_UCODEGUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
+
/* User-friendly representation of an enum */
const char *intel_uc_fw_status_repr(enumintel_uc_fw_statusstatus) {drivers/gpu/drm/i915/intel_guc_loader.c +4
-0@@ -421,6 +426,10 @@ int intel_guc_select_fw(struct intel_guc *guc) 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 {
Quoted 3 lines
DRM_ERROR("No GuC firmware known for platform with GuC!\n");
return-ENOENT;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx