* [PATCH] i915/guc: Add Kabylake GuC Loading @ 2016-01-18 14:41 Peter Antoine 2016-01-18 15:20 ` ✓ Fi.CI.BAT: success for " Patchwork 2016-01-19 18:17 ` [PATCH] " Yu Dai 0 siblings, 2 replies; 5+ messages in thread From: Peter Antoine @ 2016-01-18 14:41 UTC (permalink / raw) To: intel-gfx; +Cc: daniel.vetter, dave.gordon This patch added the loading of the GuC for Kabylake. It loads a 2.4 firmware. Signed-off-by: Peter Antoine <peter.antoine@intel.com> Signed-off-by: Michel Thierry <michel.thierry@intel.com> --- drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 3accd91..bbfa8f3 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -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 */ -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for i915/guc: Add Kabylake GuC Loading 2016-01-18 14:41 [PATCH] i915/guc: Add Kabylake GuC Loading Peter Antoine @ 2016-01-18 15:20 ` Patchwork 2016-01-19 18:17 ` [PATCH] " Yu Dai 1 sibling, 0 replies; 5+ messages in thread From: Patchwork @ 2016-01-18 15:20 UTC (permalink / raw) To: Peter Antoine; +Cc: intel-gfx == Summary == Built on 98ee62c2326e0b6881eb0f427895aab745febf6f drm-intel-nightly: 2016y-01m-18d-14h-18m-27s UTC integration manifest Test gem_storedw_loop: Subgroup basic-render: pass -> DMESG-WARN (skl-i5k-2) UNSTABLE dmesg-warn -> PASS (bdw-ultra) UNSTABLE pass -> DMESG-WARN (skl-i7k-2) UNSTABLE Test kms_pipe_crc_basic: Subgroup suspend-read-crc-pipe-a: dmesg-warn -> PASS (snb-x220t) bdw-nuci7 total:140 pass:131 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:140 pass:133 dwarn:0 dfail:1 fail:0 skip:6 bsw-nuc-2 total:143 pass:117 dwarn:2 dfail:0 fail:0 skip:24 byt-nuc total:143 pass:125 dwarn:3 dfail:0 fail:0 skip:15 hsw-brixbox total:143 pass:136 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:143 pass:139 dwarn:0 dfail:0 fail:0 skip:4 ilk-hp8440p total:143 pass:102 dwarn:3 dfail:0 fail:0 skip:38 ivb-t430s total:137 pass:124 dwarn:3 dfail:4 fail:0 skip:6 skl-i5k-2 total:143 pass:133 dwarn:2 dfail:0 fail:0 skip:8 skl-i7k-2 total:143 pass:133 dwarn:2 dfail:0 fail:0 skip:8 snb-dellxps total:143 pass:124 dwarn:5 dfail:0 fail:0 skip:14 snb-x220t total:143 pass:124 dwarn:5 dfail:0 fail:1 skip:13 Results at /archive/results/CI_IGT_test/Patchwork_1212/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i915/guc: Add Kabylake GuC Loading 2016-01-18 14:41 [PATCH] i915/guc: Add Kabylake GuC Loading Peter Antoine 2016-01-18 15:20 ` ✓ Fi.CI.BAT: success for " Patchwork @ 2016-01-19 18:17 ` Yu Dai 2016-01-19 21:19 ` Antoine, Peter 2016-01-19 21:51 ` Antoine, Peter 1 sibling, 2 replies; 5+ messages in thread From: Yu Dai @ 2016-01-19 18:17 UTC (permalink / raw) To: Peter Antoine, intel-gfx; +Cc: daniel.vetter, dave.gordon I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL. Thanks, Alex On 01/18/2016 06:41 AM, Peter Antoine wrote: > This patch added the loading of the GuC for Kabylake. > It loads a 2.4 firmware. > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index 3accd91..bbfa8f3 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -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 */ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i915/guc: Add Kabylake GuC Loading 2016-01-19 18:17 ` [PATCH] " Yu Dai @ 2016-01-19 21:19 ` Antoine, Peter 2016-01-19 21:51 ` Antoine, Peter 1 sibling, 0 replies; 5+ messages in thread From: Antoine, Peter @ 2016-01-19 21:19 UTC (permalink / raw) To: Dai, Yu, intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, Gordon, Dave Yup, I missed a patch. Just sent a new sequence. Peter. -----Original Message----- From: Dai, Yu Sent: Tuesday, January 19, 2016 6:18 PM To: Antoine, Peter; intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL. Thanks, Alex On 01/18/2016 06:41 AM, Peter Antoine wrote: > This patch added the loading of the GuC for Kabylake. > It loads a 2.4 firmware. > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c > b/drivers/gpu/drm/i915/intel_guc_loader.c > index 3accd91..bbfa8f3 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -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 */ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] i915/guc: Add Kabylake GuC Loading 2016-01-19 18:17 ` [PATCH] " Yu Dai 2016-01-19 21:19 ` Antoine, Peter @ 2016-01-19 21:51 ` Antoine, Peter 1 sibling, 0 replies; 5+ messages in thread From: Antoine, Peter @ 2016-01-19 21:51 UTC (permalink / raw) To: Dai, Yu, intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, Gordon, Dave Please look at v2, had to change the order of the patches. -----Original Message----- From: Antoine, Peter Sent: Tuesday, January 19, 2016 9:20 PM To: Dai, Yu; intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel Subject: RE: [PATCH] i915/guc: Add Kabylake GuC Loading Yup, I missed a patch. Just sent a new sequence. Peter. -----Original Message----- From: Dai, Yu Sent: Tuesday, January 19, 2016 6:18 PM To: Antoine, Peter; intel-gfx@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch; Gordon, Dave; Thierry, Michel Subject: Re: [PATCH] i915/guc: Add Kabylake GuC Loading I am OK with change here. However, in i915_drv.h, please check definition of HAS_GUC_UCODE() and HAS_GUC_SCHED(). I believe they are disabled for KBL. Thanks, Alex On 01/18/2016 06:41 AM, Peter Antoine wrote: > This patch added the loading of the GuC for Kabylake. > It loads a 2.4 firmware. > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_loader.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c > b/drivers/gpu/drm/i915/intel_guc_loader.c > index 3accd91..bbfa8f3 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -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 */ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-19 21:51 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-18 14:41 [PATCH] i915/guc: Add Kabylake GuC Loading Peter Antoine 2016-01-18 15:20 ` ✓ Fi.CI.BAT: success for " Patchwork 2016-01-19 18:17 ` [PATCH] " Yu Dai 2016-01-19 21:19 ` Antoine, Peter 2016-01-19 21:51 ` Antoine, Peter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox