[PATCH 0/3] Load Guc and huC on Geminilake

[PATCH 0/3] Load Guc and huC on Geminilake

[Anusha Srivatsa]

The following changes since commit 2a9b2cf50fb32e36e4fc1586c2f6f1421913b553:

  Merge branch 'for-upstreaming-v1.7.2' of https://github.com/felix-cavium/linux-firmware (2018-05-18 08:35:22 -0400)

are available in the git repository at:

  git://anongit.freedesktop.org/drm/drm-firmware master

for you to fetch changes up to e2d61f2778f808d4c4ad1b860e0ad8fe871eccc3:

  Merge remote-tracking branch 'official/master' (2018-05-22 21:57:10 -0700)

----------------------------------------------------------------
Anusha Srivatsa (12):
      linux-firmware/i915: GuC firmware for Cannonlake v11.102
      linux-firmware/i915: HuC firmware for Cannonlake v9.01.2678
      Revert "linux-firmware/i915: HuC firmware for Cannonlake v9.01.2678"
      Revert "linux-firmware/i915: GuC firmware for Cannonlake v11.102"
      Merge remote-tracking branch 'official/master' into drm-firmware
      linux-firmware/i915: GuC firmware for Cannonlake v11.102
      linux-firmware/i915: HuC firmware for Cannonlake v9.01.2719
      Merge remote-tracking branch 'official/master'
      linux-firmware: Add GuC v11.98 for geminilake
      linux-firmware: Add HuC v3.00.2225 for geminilake
      Revert "linux-firmware/i915: GuC firmware for Cannonlake v11.102" Revert "linux-firmware/i915: HuC firmware for Cannonlake v9.01.2719"
      Merge remote-tracking branch 'official/master'

 WHENCE                         |   7 +++++++
 i915/glk_guc_ver11_98.bin      | Bin 0 -> 154240 bytes
 i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
 3 files changed, 7 insertions(+)
 create mode 100644 i915/glk_guc_ver11_98.bin
 create mode 100644 i915/glk_huc_ver03_00_2225.bin

Anusha Srivatsa (2):
  drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
  Enable guc loading for Geminilake.

John Spotswood (1):
  drm/i915/guc: Load GuC v11.98 for Geminilake.

 drivers/gpu/drm/i915/i915_params.h  |  2 +-
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

-- 
2.7.4

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

[PATCH 1/3] drm/i915/guc: Load GuC v11.98 for Geminilake.

[Anusha Srivatsa]

From: John Spotswood <john.a.spotswood@intel.com>

load the v11.98 guC on geminilake.

v2: rebased.

Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: John Spotswood <john.a.spotswood@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index a9e6fcc..29b1d92 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -39,6 +39,9 @@
 #define KBL_FW_MAJOR 9
 #define KBL_FW_MINOR 39
 
+#define GLK_FW_MAJOR 11
+#define GLK_FW_MINOR 98
+
 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
 
@@ -51,6 +54,9 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)
 MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
+MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
+
 static void guc_fw_select(struct intel_uc_fw *guc_fw)
 {
 	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
@@ -77,6 +83,10 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
 		guc_fw->path = I915_KBL_GUC_UCODE;
 		guc_fw->major_ver_wanted = KBL_FW_MAJOR;
 		guc_fw->minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc_fw->path = I915_GLK_GUC_UCODE;
+		guc_fw->major_ver_wanted = GLK_FW_MAJOR;
+		guc_fw->minor_ver_wanted = GLK_FW_MINOR;
 	} else {
 		DRM_WARN("%s: No firmware known for this platform!\n",
 			 intel_uc_fw_type_repr(guc_fw->type));
-- 
2.7.4

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

[PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

[Anusha Srivatsa]

load the v03.00.2555 huC on geminilake.

v2:
- rebased.
- Load the correct the version. (John Spotswood)

Cc: John Spotswood <john.a.spotswood@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index f93d238..ae293f9 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -34,6 +34,10 @@
 #define KBL_HUC_FW_MINOR 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 03
+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 2555
+
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
 	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -50,6 +54,10 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
 	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
 MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
 
+#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
+	GLK_HUC_FW_MINOR, GLK_BLD_NUM)
+MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
+
 static void huc_fw_select(struct intel_uc_fw *huc_fw)
 {
 	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
@@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
 		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;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		huc_fw->path = I915_GLK_HUC_UCODE;
+		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
+		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
 		DRM_WARN("%s: No firmware known for this platform!\n",
 			 intel_uc_fw_type_repr(huc_fw->type));
-- 
2.7.4

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

[PATCH 3/3] Enable guc loading for Geminilake.

[Anusha Srivatsa]

Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index aebe046..3e4e128 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,7 @@ struct drm_printer;
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc, 0) \
+	param(int, enable_guc, -1) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
-- 
2.7.4

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

✗ Fi.CI.BAT: failure for Load Guc and huC on Geminilake (rev2)

[Patchwork]

== Series Details ==

Series: Load Guc and huC on Geminilake (rev2)
URL   : https://patchwork.freedesktop.org/series/43600/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4222 -> Patchwork_9091 =

== Summary - FAILURE ==

  Serious unknown changes coming with Patchwork_9091 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_9091, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/43600/revisions/2/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_9091:

  === IGT changes ===

    ==== Possible regressions ====

    igt@drv_module_reload@basic-no-display:
      fi-glk-j4005:       PASS -> DMESG-FAIL +2

    
    ==== Warnings ====

    igt@kms_addfb_basic@too-high:
      fi-glk-j4005:       PASS -> SKIP +242

    
== Known issues ==

  Here are the changes found in Patchwork_9091 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      fi-bxt-dsi:         PASS -> INCOMPLETE (fdo#103927)

    
    ==== Possible fixes ====

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-skl-6770hq:      FAIL (fdo#100368, fdo#103928) -> PASS

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       DMESG-FAIL (fdo#102614, fdo#106103) -> PASS

    
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
  fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103


== Participating hosts (44 -> 38) ==

  Missing    (6): fi-ilk-m540 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-6700hq 


== Build changes ==

    * Linux: CI_DRM_4222 -> Patchwork_9091

  CI_DRM_4222: e783c316409040dab016975896e718fc36cbd8e6 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4492: 0b381c7d1067a4fe520b72d4d391d4920834cbe0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9091: 50add448bf1e3ba9b4c5098756fe9e2701ab4ccd @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4492: 53aa71861efe0095405673c98ff15f6dcf268901 @ git://anongit.freedesktop.org/piglit


== Linux commits ==

50add448bf1e Enable guc loading for Geminilake.
d8ff6eef4a71 drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
b69090db75ce drm/i915/guc: Load GuC v11.98 for Geminilake.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9091/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

[Tomi Sarvela]

On 05/23/2018 09:15 AM, Anusha Srivatsa wrote:
> load the v03.00.2555 huC on geminilake.
> 
> v2:
> - rebased.
> - Load the correct the version. (John Spotswood)
> 
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
> Cc: Jani Saarinen <jani.saarinen@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
> index f93d238..ae293f9 100644
> --- a/drivers/gpu/drm/i915/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_huc_fw.c
> @@ -34,6 +34,10 @@
>   #define KBL_HUC_FW_MINOR 00
>   #define KBL_BLD_NUM 1810
>   
> +#define GLK_HUC_FW_MAJOR 03
> +#define GLK_HUC_FW_MINOR 00
> +#define GLK_BLD_NUM 2555

Can you check if this should be

#define GLK_BLD_NUM 2225

This is the newest GLK HuC firmware version I have seen.

Best regards,

Tomi Sarvela

> +
>   #define HUC_FW_PATH(platform, major, minor, bld_num) \
>   	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
>   	__stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -50,6 +54,10 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
>   	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
>   MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>   
> +#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
> +	GLK_HUC_FW_MINOR, GLK_BLD_NUM)
> +MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
> +
>   static void huc_fw_select(struct intel_uc_fw *huc_fw)
>   {
>   	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> @@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
>   		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;
> +	} else if (IS_GEMINILAKE(dev_priv)) {
> +		huc_fw->path = I915_GLK_HUC_UCODE;
> +		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
> +		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
>   	} else {
>   		DRM_WARN("%s: No firmware known for this platform!\n",
>   			 intel_uc_fw_type_repr(huc_fw->type));
> 

-- 
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

[Saarinen, Jani]

HI. 

> -----Original Message-----
> From: Sarvela, Tomi P
> Sent: keskiviikko 23. toukokuuta 2018 10.53
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: Spotswood, John A <john.a.spotswood@intel.com>; Saarinen, Jani
> <jani.saarinen@intel.com>
> Subject: Re: [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
> 
> On 05/23/2018 09:15 AM, Anusha Srivatsa wrote:
> > load the v03.00.2555 huC on geminilake.
> >
> > v2:
> > - rebased.
> > - Load the correct the version. (John Spotswood)
> >
> > Cc: John Spotswood <john.a.spotswood@intel.com>
> > Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
> > Cc: Jani Saarinen <jani.saarinen@intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > ---
> >   drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
> >   1 file changed, 12 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c
> > b/drivers/gpu/drm/i915/intel_huc_fw.c
> > index f93d238..ae293f9 100644
> > --- a/drivers/gpu/drm/i915/intel_huc_fw.c
> > +++ b/drivers/gpu/drm/i915/intel_huc_fw.c
> > @@ -34,6 +34,10 @@
> >   #define KBL_HUC_FW_MINOR 00
> >   #define KBL_BLD_NUM 1810
> >
> > +#define GLK_HUC_FW_MAJOR 03
> > +#define GLK_HUC_FW_MINOR 00
> > +#define GLK_BLD_NUM 2555
> 
> Can you check if this should be
> 
> #define GLK_BLD_NUM 2225
In patch 0/3 you have 

WHENCE                         |   7 +++++++
 i915/glk_guc_ver11_98.bin      | Bin 0 -> 154240 bytes
 i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
 3 files changed, 7 insertions(+)
 create mode 100644 i915/glk_guc_ver11_98.bin  create mode 100644 i915/glk_huc_ver03_00_2225.bin

So most probably typo  like Tomi says.

> 
> This is the newest GLK HuC firmware version I have seen.
> 
> Best regards,
> 
> Tomi Sarvela
> 
> > +
> >   #define HUC_FW_PATH(platform, major, minor, bld_num) \
> >   	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
> >   	__stringify(minor) "_" __stringify(bld_num) ".bin"
> > @@ -50,6 +54,10 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
> >   	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
> >   MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
> >
> > +#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR,
> \
> > +	GLK_HUC_FW_MINOR, GLK_BLD_NUM)
> > +MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
> > +
> >   static void huc_fw_select(struct intel_uc_fw *huc_fw)
> >   {
> >   	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
> > @@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
> >   		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;
> > +	} else if (IS_GEMINILAKE(dev_priv)) {
> > +		huc_fw->path = I915_GLK_HUC_UCODE;
> > +		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
> > +		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
> >   	} else {
> >   		DRM_WARN("%s: No firmware known for this platform!\n",
> >   			 intel_uc_fw_type_repr(huc_fw->type));
> >
> 
> --


Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo


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