drm/i915/guc: Consolidate firmware major-minor to one place
Subsystems (2)
PATCH 1/1 drm/i915/guc: Consolidate firmware major-minor to one place
From: Tvrtko Ursulin <[email protected]>
Currently to change the firmware one has to update the exported module firmware string and the major-minor versions used for verification after load. Consolidate that to a single place defining correct major and minor versions per platform.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +15 -6
@@ -59,10 +59,19 @@* */ -#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin" +#define SKL_FW_MAJOR 6 +#define SKL_FW_MINOR 1 + +#define BXT_FW_MAJOR 8 +#define BXT_FW_MINOR 7 + +#define GUC_FW_PATH (platform, major, minor) \ + "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin" + +#define I915_SKL_GUC_UCODE GUC_FW_PATH(skl, SKL_FW_MAJOR, SKL_FW_MINOR)MODULE_FIRMWARE (I915_SKL_GUC_UCODE ); -#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" +#define I915_BXT_GUC_UCODE GUC_FW_PATH(bxt, BXT_FW_MAJOR, BXT_FW_MINOR)MODULE_FIRMWARE (I915_BXT_GUC_UCODE );/* User-friendly representation of an enum */
@@ -692,12 +701,12 @@ void intel_guc_init(struct drm_device *dev) fw_path =NULL ; }else if (IS_SKYLAKE (dev)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =6 ; - guc_fw->guc_fw_minor_wanted =1 ; + guc_fw->guc_fw_major_wanted =SKL_FW_MAJOR ; + guc_fw->guc_fw_minor_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =8 ; - guc_fw->guc_fw_minor_wanted =7 ; + guc_fw->guc_fw_major_wanted =BXT_FW_MAJOR ; + guc_fw->guc_fw_minor_wanted =BXT_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 9 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently to change the firmware one has to update the exported module firmware string and the major-minor versions used for verification after load. Consolidate that to a single place defining correct major and minor versions per platform.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Dave Gordon <[email protected]>
I guess this would be nice on top of the patch that enables guc loading on kbl?
Jani.
Quoted 47 lines
--- drivers/gpu/drm/i915/intel_guc_loader.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_guc_loader.c +15
-6@@ -59,10 +59,19 @@* */ -#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin" +#define SKL_FW_MAJOR 6 +#define SKL_FW_MINOR 1 + +#define BXT_FW_MAJOR 8 +#define BXT_FW_MINOR 7 + +#define GUC_FW_PATH (platform, major, minor) \ + "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin" + +#define I915_SKL_GUC_UCODE GUC_FW_PATH(skl, SKL_FW_MAJOR, SKL_FW_MINOR)MODULE_FIRMWARE (I915_SKL_GUC_UCODE ); -#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" +#define I915_BXT_GUC_UCODE GUC_FW_PATH(bxt, BXT_FW_MAJOR, BXT_FW_MINOR)MODULE_FIRMWARE (I915_BXT_GUC_UCODE );/* User-friendly representation of an enum */ @@ -692,12 +701,12 @@ void intel_guc_init(struct drm_device *dev) fw_path =NULL ; }else if (IS_SKYLAKE (dev)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =6 ; - guc_fw->guc_fw_minor_wanted =1 ; + guc_fw->guc_fw_major_wanted =SKL_FW_MAJOR ; + guc_fw->guc_fw_minor_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =8 ; - guc_fw->guc_fw_minor_wanted =7 ; + guc_fw->guc_fw_major_wanted =BXT_FW_MAJOR ; + guc_fw->guc_fw_minor_wanted =BXT_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Ro.CI.BAT: success for drm/i915/guc: Consolidate firmware major-minor to one place
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915/guc: Consolidate firmware major-minor to one place
URL : https://patchwork.freedesktop.org/series/9318/
State : success
== Summary ==
Series 9318v1 drm/i915/guc: Consolidate firmware major-minor to one place
http://patchwork.freedesktop.org/api/1.0/series/9318/revisions/1/mbox
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-c:
skip -> PASS (fi-skl-i5-6260u)fi-skl-i5-6260u total:229 pass:204 dwarn:0 dfail:0 fail:0 skip:25 fi-skl-i7-6700k total:229 pass:190 dwarn:0 dfail:0 fail:0 skip:39 fi-snb-i7-2600 total:229 pass:176 dwarn:0 dfail:0 fail:0 skip:53 ro-bdw-i5-5250u total:229 pass:204 dwarn:2 dfail:1 fail:0 skip:22 ro-bdw-i7-5557U total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5600u total:229 pass:190 dwarn:0 dfail:1 fail:0 skip:38 ro-byt-n2820 total:229 pass:179 dwarn:1 dfail:1 fail:3 skip:45 ro-hsw-i3-4010u total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-hsw-i7-4770r total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-ilk-i7-620lm total:229 pass:157 dwarn:0 dfail:1 fail:1 skip:70 ro-ilk1-i5-650 total:224 pass:157 dwarn:0 dfail:1 fail:1 skip:65 ro-ivb-i7-3770 total:229 pass:188 dwarn:0 dfail:1 fail:0 skip:40 ro-ivb2-i7-3770 total:229 pass:192 dwarn:0 dfail:1 fail:0 skip:36 ro-skl3-i5-6260u total:229 pass:208 dwarn:1 dfail:1 fail:0 skip:19 ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
fi-kbl-qkkr failed to connect after reboot
ro-bsw-n3050 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_1342/
e112966 drm-intel-nightly: 2016y-06m-30d-12h-06m-36s UTC integration manifest f6739ae drm/i915/guc: Consolidate firmware major-minor to one place
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Currently to change the firmware one has to update the exported module firmware string and the major-minor versions used for verification after load. Consolidate that to a single place defining correct major and minor versions per platform.
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Dave Gordon <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_guc_loader.c +12
-4@@ -59,10 +59,19 @@* */ -#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin" +#define SKL_FW_MAJOR 6 +#define SKL_FW_MINOR 1 + +#define BXT_FW_MAJOR 8 +#define BXT_FW_MINOR 7 + +#define GUC_FW_PATH (platform, major, minor) \ + "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin" + +#define I915_SKL_GUC_UCODE GUC_FW_PATH(skl, SKL_FW_MAJOR, SKL_FW_MINOR)MODULE_FIRMWARE (I915_SKL_GUC_UCODE ); -#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" +#define I915_BXT_GUC_UCODE GUC_FW_PATH(bxt, BXT_FW_MAJOR, BXT_FW_MINOR)MODULE_FIRMWARE (I915_BXT_GUC_UCODE );/* User-friendly representation of an enum */ @@ -692,12 +701,12 @@ void intel_guc_init(struct drm_device *dev) fw_path =NULL ; }else if (IS_SKYLAKE (dev)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =6 ; - guc_fw->guc_fw_minor_wanted =1 ; + guc_fw->guc_fw_major_wanted =SKL_FW_MAJOR ;
drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_init(struct drm_device *dev) · line 712
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-2+ guc_fw->guc_fw_minor_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =8 ; - guc_fw->guc_fw_minor_wanted =7 ; + guc_fw->guc_fw_major_wanted =BXT_FW_MAJOR ; + guc_fw->guc_fw_minor_wanted =BXT_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ }
Looks fine.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx