Enable GuC Loading on Kabylake
Subsystems (2)
cover Enable GuC Loading on Kabylake
This patchset reverts the disabling of the GuC loading for Kabylake and then adds then specifically enables Kabylake GuC loading and specifies the Kabylake firmware filename.
Peter Antoine (2):
Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading
for now on Kabylake."
i915/guc: Add Kabylake GuC Loading
drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {#define HAS_CSR (dev) (IS_GEN9(dev)) -#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) -#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC_UCODE (dev) (IS_GEN9(dev)) +#define HAS_GUC_SCHED (dev) (IS_GEN9(dev))#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
Quoted 1 line · Peter Antoine
This reverts commit
a92d3f32eafc57cca55e654ecfd916f283100365.
Shouldnt' this be patch 2/2? Enabling guc loading before it's fixed isn't awesome.
Either way needs a proper commit message (why is it ok to enable now?) plus s-o-b.
-Daniel
Quoted 22 lines
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {#define HAS_CSR (dev) (IS_GEN9(dev)) -#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) -#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC_UCODE (dev) (IS_GEN9(dev)) +#define HAS_GUC_SCHED (dev) (IS_GEN9(dev))#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)Signature · 1 line
1.9.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
Quoted 7 lines · Daniel Vetter
Quoted 1 line · Peter Antoine
This reverts commit
a92d3f32eafc57cca55e654ecfd916f283100365.Shouldnt' this be patch 2/2? Enabling guc loading before it's fixed isn't awesome.
Either way needs a proper commit message (why is it ok to enable now?)
This request was from Sean Kelley who is working on some Media features for KBL that relies on HuC firmware. HuC loading is done by GuC.
Thanks,
Alex
Quoted 17 lines
Quoted 17 lines
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {#define HAS_CSR (dev) (IS_GEN9(dev)) -#define HAS_GUC_UCODE (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) -#define HAS_GUC_SCHED (dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev)) +#define HAS_GUC_UCODE (dev) (IS_GEN9(dev)) +#define HAS_GUC_SCHED (dev) (IS_GEN9(dev))
Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +0
-1#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8) --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 i915/guc: Add Kabylake GuC Loading
In reply to Peter AntoineThis patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +6 -0
@@ -61,6 +61,8 @@#define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin"MODULE_FIRMWARE (I915_SKL_GUC_UCODE ); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver2.bin" +MODULE_FIRMWARE (I915_KBL_GUC_UCODE );/* User-friendly representation of an enum */ const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status)
@@ -597,6 +599,10 @@ void intel_guc_ucode_init(struct drm_device *dev) fw_path =I915_SKL_GUC_UCODE ; guc_fw->guc_fw_major_wanted =4 ; guc_fw->guc_fw_minor_wanted =3 ; + }else if (IS_KABYLAKE (dev)) { + fw_path =I915_KBL_GUC_UCODE ; + guc_fw->guc_fw_major_wanted =2 ; + guc_fw->guc_fw_minor_wanted =4 ; }else { i915.enable_guc_submission = false; fw_path ="" ;/* unknown device */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx