public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake
@ 2017-06-08 23:48 Anusha Srivatsa
  2017-06-08 23:48 ` [PATCH 2/2] drm/i915/huc: Load HuC " Anusha Srivatsa
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Anusha Srivatsa @ 2017-06-08 23:48 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

Coffee Lake reuses Kabylake's GuC.

v2: Change Coffeelake to Coffee Lake

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c         | 1 +
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 03a495e..418072a 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -427,6 +427,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
 	BDW_FEATURES, \
 	.gen = 9, \
 	.platform = INTEL_COFFEELAKE, \
+	.has_guc = 1, \
 	.ddb_size = 896
 
 static const struct intel_device_info intel_coffeelake_info = {
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index d9045b6..8b0ae7f 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -402,7 +402,7 @@ int intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.path = I915_BXT_GUC_UCODE;
 		guc->fw.major_ver_wanted = BXT_FW_MAJOR;
 		guc->fw.minor_ver_wanted = BXT_FW_MINOR;
-	} else if (IS_KABYLAKE(dev_priv)) {
+	} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
 		guc->fw.path = I915_KBL_GUC_UCODE;
 		guc->fw.major_ver_wanted = KBL_FW_MAJOR;
 		guc->fw.minor_ver_wanted = KBL_FW_MINOR;
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] drm/i915/huc: Load HuC on Coffee Lake
  2017-06-08 23:48 [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake Anusha Srivatsa
@ 2017-06-08 23:48 ` Anusha Srivatsa
  2017-06-09 12:03   ` Fiedorowicz, Lukasz
  2017-06-09  0:17 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Load GuC " Patchwork
  2017-06-09 12:03 ` [PATCH 1/2] " Fiedorowicz, Lukasz
  2 siblings, 1 reply; 6+ messages in thread
From: Anusha Srivatsa @ 2017-06-08 23:48 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

Coffee Lake reuses Kabylake's HUC firmware.

v2: Change Coffeelake to Coffee Lake

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index f5eb18d0e..6145fa0 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -167,7 +167,7 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.path = I915_BXT_HUC_UCODE;
 		huc->fw.major_ver_wanted = BXT_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;
-	} else if (IS_KABYLAKE(dev_priv)) {
+	} else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
 		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;
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Load GuC on Coffee Lake
  2017-06-08 23:48 [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake Anusha Srivatsa
  2017-06-08 23:48 ` [PATCH 2/2] drm/i915/huc: Load HuC " Anusha Srivatsa
@ 2017-06-09  0:17 ` Patchwork
  2017-06-09 12:03 ` [PATCH 1/2] " Fiedorowicz, Lukasz
  2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-06-09  0:17 UTC (permalink / raw)
  To: Anusha Srivatsa; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/2] drm/i915/guc: Load GuC on Coffee Lake
URL   : https://patchwork.freedesktop.org/series/25517/
State : success

== Summary ==

Series 25517v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/25517/revisions/1/mbox/

Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-kbl-7560u) fdo#100125
Test kms_busy:
        Subgroup basic-flip-default-b:
                fail       -> DMESG-WARN (fi-skl-6700hq) fdo#101144

fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:446s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:433s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:585s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:512s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:485s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:483s
fi-glk-2a        total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:589s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:436s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:410s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:426s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:486s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:461s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:469s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time:572s
fi-kbl-r         total:278  pass:259  dwarn:1   dfail:0   fail:0   skip:18  time:577s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:462s
fi-skl-6700hq    total:278  pass:228  dwarn:2   dfail:0   fail:26  skip:22  time:402s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:464s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:505s
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:535s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:400s

5b363842b49a66879d4c67d652923fb04e44b271 drm-tip: 2017y-06m-08d-20h-34m-37s UTC integration manifest
155f007 drm/i915/huc: Load HuC on Coffee Lake
9dc6fef drm/i915/guc: Load GuC on Coffee Lake

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4919/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake
  2017-06-08 23:48 [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake Anusha Srivatsa
  2017-06-08 23:48 ` [PATCH 2/2] drm/i915/huc: Load HuC " Anusha Srivatsa
  2017-06-09  0:17 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Load GuC " Patchwork
@ 2017-06-09 12:03 ` Fiedorowicz, Lukasz
  2 siblings, 0 replies; 6+ messages in thread
From: Fiedorowicz, Lukasz @ 2017-06-09 12:03 UTC (permalink / raw)
  To: intel-gfx@lists.freedesktop.org, Srivatsa, Anusha; +Cc: Vivi, Rodrigo

On Thu, 2017-06-08 at 16:48 -0700, Anusha Srivatsa wrote:
> Coffee Lake reuses Kabylake's GuC.
> 
> v2: Change Coffeelake to Coffee Lake
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>

-Lukasz

> ---
>  drivers/gpu/drm/i915/i915_pci.c         | 1 +
>  drivers/gpu/drm/i915/intel_guc_loader.c | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] drm/i915/huc: Load HuC on Coffee Lake
  2017-06-08 23:48 ` [PATCH 2/2] drm/i915/huc: Load HuC " Anusha Srivatsa
@ 2017-06-09 12:03   ` Fiedorowicz, Lukasz
  2017-06-09 19:06     ` Rodrigo Vivi
  0 siblings, 1 reply; 6+ messages in thread
From: Fiedorowicz, Lukasz @ 2017-06-09 12:03 UTC (permalink / raw)
  To: intel-gfx@lists.freedesktop.org, Srivatsa, Anusha; +Cc: Vivi, Rodrigo

On Thu, 2017-06-08 at 16:48 -0700, Anusha Srivatsa wrote:
> Coffee Lake reuses Kabylake's HUC firmware.
> 
> v2: Change Coffeelake to Coffee Lake
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>

-Lukasz

> ---
>  drivers/gpu/drm/i915/intel_huc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] drm/i915/huc: Load HuC on Coffee Lake
  2017-06-09 12:03   ` Fiedorowicz, Lukasz
@ 2017-06-09 19:06     ` Rodrigo Vivi
  0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2017-06-09 19:06 UTC (permalink / raw)
  To: Fiedorowicz, Lukasz; +Cc: intel-gfx@lists.freedesktop.org, Vivi, Rodrigo

Patches merged to dinq.
Thanks for the patches and review.

On Fri, Jun 9, 2017 at 5:03 AM, Fiedorowicz, Lukasz
<lukasz.fiedorowicz@intel.com> wrote:
> On Thu, 2017-06-08 at 16:48 -0700, Anusha Srivatsa wrote:
>> Coffee Lake reuses Kabylake's HUC firmware.
>>
>> v2: Change Coffeelake to Coffee Lake
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
> Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
>
> -Lukasz
>
>> ---
>>  drivers/gpu/drm/i915/intel_huc.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-06-09 19:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-08 23:48 [PATCH 1/2] drm/i915/guc: Load GuC on Coffee Lake Anusha Srivatsa
2017-06-08 23:48 ` [PATCH 2/2] drm/i915/huc: Load HuC " Anusha Srivatsa
2017-06-09 12:03   ` Fiedorowicz, Lukasz
2017-06-09 19:06     ` Rodrigo Vivi
2017-06-09  0:17 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Load GuC " Patchwork
2017-06-09 12:03 ` [PATCH 1/2] " Fiedorowicz, Lukasz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox