* [PATCH 0/2] Enable GuC Loading on Kabylake
@ 2016-01-19 21:18 Peter Antoine
2016-01-19 21:18 ` [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-01-19 21:18 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
0 siblings, 2 replies; 5+ messages in thread
From: Peter Antoine @ 2016-01-19 21:18 UTC (permalink / raw)
To: intel-gfx; +Cc: daniel.vetter, dave.gordon
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(-)
--
1.9.1
_______________________________________________
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* [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-01-19 21:18 [PATCH 0/2] Enable GuC Loading on Kabylake Peter Antoine
@ 2016-01-19 21:18 ` Peter Antoine
2016-01-19 21:25 ` Daniel Vetter
2016-01-19 21:18 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
1 sibling, 1 reply; 5+ messages in thread
From: Peter Antoine @ 2016-01-19 21:18 UTC (permalink / raw)
To: intel-gfx; +Cc: daniel.vetter, dave.gordon
This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index af30148..f99a988 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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)
--
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* Re: [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-01-19 21:18 ` [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
@ 2016-01-19 21:25 ` Daniel Vetter
2016-01-19 22:38 ` Yu Dai
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2016-01-19 21:25 UTC (permalink / raw)
To: Peter Antoine; +Cc: daniel.vetter, intel-gfx, dave.gordon
On Tue, Jan 19, 2016 at 09:18:50PM +0000, Peter Antoine wrote:
> 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
> ---
> drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index af30148..f99a988 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -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)
> --
> 1.9.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
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 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
2016-01-19 21:25 ` Daniel Vetter
@ 2016-01-19 22:38 ` Yu Dai
0 siblings, 0 replies; 5+ messages in thread
From: Yu Dai @ 2016-01-19 22:38 UTC (permalink / raw)
To: Daniel Vetter, Peter Antoine; +Cc: daniel.vetter, intel-gfx, dave.gordon
On 01/19/2016 01:25 PM, Daniel Vetter wrote:
> On Tue, Jan 19, 2016 at 09:18:50PM +0000, Peter Antoine wrote:
> > 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
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index af30148..f99a988 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -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)
> > --
> > 1.9.1
> >
>
_______________________________________________
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
* [PATCH 2/2] i915/guc: Add Kabylake GuC Loading
2016-01-19 21:18 [PATCH 0/2] Enable GuC Loading on Kabylake Peter Antoine
2016-01-19 21:18 ` [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
@ 2016-01-19 21:18 ` Peter Antoine
1 sibling, 0 replies; 5+ messages in thread
From: Peter Antoine @ 2016-01-19 21:18 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
end of thread, other threads:[~2016-01-19 22:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-19 21:18 [PATCH 0/2] Enable GuC Loading on Kabylake Peter Antoine
2016-01-19 21:18 ` [PATCH 1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake." Peter Antoine
2016-01-19 21:25 ` Daniel Vetter
2016-01-19 22:38 ` Yu Dai
2016-01-19 21:18 ` [PATCH 2/2] i915/guc: Add Kabylake GuC Loading Peter Antoine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox