[PATCH] Icelake DMC v1.07

[PATCH] Icelake DMC v1.07

[Anusha Srivatsa]

Adding Pull request for CI to pick:
The following changes since commit 7b5835fd37630d18ac0c755329172f6a17c1af29:

  linux-firmware: add firmware for mt76x2u (2018-07-30 07:20:31 -0400)

are available in the git repository at:

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

for you to fetch changes up to 1e54a19c7a2c300aabb9ca69901dd94b1f6e5b70:

  firmware/icl/dmc: Add DMC v1.07 for Icelake. (2018-07-30 15:13:45 -0700)

----------------------------------------------------------------
Anusha Srivatsa (5):
      linux-firmware: Add GuC v11.98 for geminilake
      linux-firmware: Add HuC v3.00.2225 for geminilake
      firmware/icl/dmc: Add DMC v1.05 for Icelake.
      Merge remote-tracking branch 'official/master'
      firmware/icl/dmc: Add DMC v1.07 for Icelake.

 WHENCE                         |  12 ++++++++++++
 i915/glk_guc_ver11_98.bin      | Bin 0 -> 154240 bytes
 i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
 i915/icl_dmc_ver1_05.bin       | Bin 0 -> 25836 bytes
 i915/icl_dmc_ver1_07.bin       | Bin 0 -> 25716 bytes
 5 files changed, 12 insertions(+)
 create mode 100644 i915/glk_guc_ver11_98.bin
 create mode 100644 i915/glk_huc_ver03_00_2225.bin
 create mode 100644 i915/icl_dmc_ver1_05.bin
 create mode 100644 i915/icl_dmc_ver1_07.bin

Anusha Srivatsa (1):
  firmware/dmc/icl: load v1.07 on icelake.

 drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
 1 file changed, 7 insertions(+)

-- 
2.7.4

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

[PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Anusha Srivatsa]

Add Support to load DMC on Icelake.

While at it, also add support to load the firmware
during system resume.

v2: load firmware during system resume.(Imre)

Cc: Imre Deak <imre.deak@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
 drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index cf9b600..393d419 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,9 @@
  * low-power state and comes back to normal.
  */
 
+#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
+#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
+
 #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
 MODULE_FIRMWARE(I915_CSR_GLK);
 #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
@@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
 		/* Bypass version check for firmware override. */
 		required_version = csr->version;
+	} else if (IS_ICELAKE(dev_priv)) {
+		required_version = ICL_CSR_VERSION_REQUIRED;
 	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
@@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 
 	if (i915_modparams.dmc_firmware_path)
 		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_ICELAKE(dev_priv))
+		csr->fw_path = I915_CSR_ICL;
 	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index cf89141..77c0986 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,
 
 	/* 7. Setup MBUS. */
 	icl_mbus_init(dev_priv);
+
+	if (resume && dev_priv->csr.dmc_payload)
+		intel_csr_load_program(dev_priv);
 }
 
 static void icl_display_core_uninit(struct drm_i915_private *dev_priv)
-- 
2.7.4

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Paulo Zanoni]

Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
> Add Support to load DMC on Icelake.
> 
> While at it, also add support to load the firmware
> during system resume.
> 
> v2: load firmware during system resume.(Imre)

Just to make it clear: did we test this on actual machines before
submitting or are we entirely relying on the CI results?

I'm not sure the CI is running enough tests to validate this patch with
confidence, we'll probably need to do some manual testing here.

> 
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>  drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c
> b/drivers/gpu/drm/i915/intel_csr.c
> index cf9b600..393d419 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -34,6 +34,9 @@
>   * low-power state and comes back to normal.
>   */
>  
> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
> +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
> +
>  #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>  MODULE_FIRMWARE(I915_CSR_GLK);
>  #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
> drm_i915_private *dev_priv,
>  	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>  		/* Bypass version check for firmware override. */
>  		required_version = csr->version;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		required_version = ICL_CSR_VERSION_REQUIRED;
>  	} else if (IS_CANNONLAKE(dev_priv)) {
>  		required_version = CNL_CSR_VERSION_REQUIRED;
>  	} else if (IS_GEMINILAKE(dev_priv)) {
> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private
> *dev_priv)
>  
>  	if (i915_modparams.dmc_firmware_path)
>  		csr->fw_path = i915_modparams.dmc_firmware_path;
> +	else if (IS_ICELAKE(dev_priv))
> +		csr->fw_path = I915_CSR_ICL;
>  	else if (IS_CANNONLAKE(dev_priv))
>  		csr->fw_path = I915_CSR_CNL;
>  	else if (IS_GEMINILAKE(dev_priv))
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
> b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index cf89141..77c0986 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
> drm_i915_private *dev_priv,
>  
>  	/* 7. Setup MBUS. */
>  	icl_mbus_init(dev_priv);
> +
> +	if (resume && dev_priv->csr.dmc_payload)
> +		intel_csr_load_program(dev_priv);
>  }
>  
>  static void icl_display_core_uninit(struct drm_i915_private
> *dev_priv)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for firmware/dmc/icl: load v1.07 on icelake. (rev2)

[Patchwork]

== Series Details ==

Series: firmware/dmc/icl: load v1.07 on icelake. (rev2)
URL   : https://patchwork.freedesktop.org/series/47450/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4605 -> Patchwork_9837 =

== Summary - SUCCESS ==

  No regressions found.

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

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_guc:
      fi-skl-guc:         NOTRUN -> DMESG-WARN (fdo#107175, fdo#107258)

    igt@drv_selftest@live_hangcheck:
      fi-cfl-8700k:       PASS -> DMESG-FAIL (fdo#106560)

    igt@drv_selftest@live_workarounds:
      fi-cnl-psr:         PASS -> DMESG-FAIL (fdo#107292)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_workarounds:
      {fi-bdw-samus}:     DMESG-FAIL (fdo#107292) -> PASS

    igt@prime_vgem@basic-fence-flip:
      fi-ilk-650:         FAIL (fdo#104008) -> PASS

    
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
  fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
  fdo#107175 https://bugs.freedesktop.org/show_bug.cgi?id=107175
  fdo#107258 https://bugs.freedesktop.org/show_bug.cgi?id=107258
  fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292


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

  Additional (1): fi-skl-guc 
  Missing    (7): fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper 


== Build changes ==

    * Linux: CI_DRM_4605 -> Patchwork_9837

  CI_DRM_4605: 50098198da758bdd54245d511f4f97236c296c72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4582: 263ca16e4d8909f475d32a28fc0e5972bac214fb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9837: e4a6472050aca2d0e734174d181bb301ae9b76b5 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

e4a6472050ac firmware/dmc/icl: load v1.07 on icelake.

== Logs ==

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

✓ Fi.CI.IGT: success for firmware/dmc/icl: load v1.07 on icelake. (rev2)

[Patchwork]

== Series Details ==

Series: firmware/dmc/icl: load v1.07 on icelake. (rev2)
URL   : https://patchwork.freedesktop.org/series/47450/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4605_full -> Patchwork_9837_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@kms_cursor_legacy@cursora-vs-flipa-toggle:
      shard-glk:          PASS -> DMESG-WARN (fdo#105763)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665) +1

    
    ==== Possible fixes ====

    igt@pm_rps@min-max-config-loaded:
      shard-apl:          FAIL (fdo#102250) -> PASS

    
  fdo#102250 https://bugs.freedesktop.org/show_bug.cgi?id=102250
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763


== Participating hosts (5 -> 5) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4605 -> Patchwork_9837

  CI_DRM_4605: 50098198da758bdd54245d511f4f97236c296c72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4582: 263ca16e4d8909f475d32a28fc0e5972bac214fb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9837: e4a6472050aca2d0e734174d181bb301ae9b76b5 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Rodrigo Vivi]

On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
> > Add Support to load DMC on Icelake.
> > 
> > While at it, also add support to load the firmware
> > during system resume.
> > 
> > v2: load firmware during system resume.(Imre)
> 
> Just to make it clear: did we test this on actual machines before
> submitting or are we entirely relying on the CI results?
> 
> I'm not sure the CI is running enough tests to validate this patch with
> confidence, we'll probably need to do some manual testing here.

At some point I believe it was agreed that CI would test this
and get the new firmware automatically from the cover-letter.

The problem is that I don't see any cover-letter so I'm afraid
it is not running with the new firmware.

Tomi?

Also I believe in case it has the cover letter it should run
the full CI on the machine or at least stash it and run on
the weekend or whenever we run the full on all machines and
then report back again. Possible?

Martin?

> 
> > 
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
> >  drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
> >  2 files changed, 10 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c
> > b/drivers/gpu/drm/i915/intel_csr.c
> > index cf9b600..393d419 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -34,6 +34,9 @@
> >   * low-power state and comes back to normal.
> >   */
> >  
> > +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
> > +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
> > +
> >  #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
> >  MODULE_FIRMWARE(I915_CSR_GLK);
> >  #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
> > @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
> > drm_i915_private *dev_priv,
> >  	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
> >  		/* Bypass version check for firmware override. */
> >  		required_version = csr->version;
> > +	} else if (IS_ICELAKE(dev_priv)) {
> > +		required_version = ICL_CSR_VERSION_REQUIRED;
> >  	} else if (IS_CANNONLAKE(dev_priv)) {
> >  		required_version = CNL_CSR_VERSION_REQUIRED;
> >  	} else if (IS_GEMINILAKE(dev_priv)) {
> > @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private
> > *dev_priv)
> >  
> >  	if (i915_modparams.dmc_firmware_path)
> >  		csr->fw_path = i915_modparams.dmc_firmware_path;
> > +	else if (IS_ICELAKE(dev_priv))
> > +		csr->fw_path = I915_CSR_ICL;
> >  	else if (IS_CANNONLAKE(dev_priv))
> >  		csr->fw_path = I915_CSR_CNL;
> >  	else if (IS_GEMINILAKE(dev_priv))
> > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
> > b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > index cf89141..77c0986 100644
> > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> > @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
> > drm_i915_private *dev_priv,
> >  
> >  	/* 7. Setup MBUS. */
> >  	icl_mbus_init(dev_priv);
> > +
> > +	if (resume && dev_priv->csr.dmc_payload)
> > +		intel_csr_load_program(dev_priv);
> >  }
> >  
> >  static void icl_display_core_uninit(struct drm_i915_private
> > *dev_priv)
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Yadav, Jyoti R]

Hi Anusha,

I think we should also add "HAS_CSR" capability, which is being 
exercised inside intel_csr_ucode_init() path.

For ICL, inside intel_device_info structure we should add has_csr = 1, 
otherwise below check will fail and function will return from there itself.

if (!HAS_CSR(dev_priv))
                 return;

Regards
Jyoti
On 8/2/2018 10:41 AM, Rodrigo Vivi wrote:
> On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
>> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
>>> Add Support to load DMC on Icelake.
>>>
>>> While at it, also add support to load the firmware
>>> during system resume.
>>>
>>> v2: load firmware during system resume.(Imre)
>> Just to make it clear: did we test this on actual machines before
>> submitting or are we entirely relying on the CI results?
>>
>> I'm not sure the CI is running enough tests to validate this patch with
>> confidence, we'll probably need to do some manual testing here.
> At some point I believe it was agreed that CI would test this
> and get the new firmware automatically from the cover-letter.
>
> The problem is that I don't see any cover-letter so I'm afraid
> it is not running with the new firmware.
>
> Tomi?
>
> Also I believe in case it has the cover letter it should run
> the full CI on the machine or at least stash it and run on
> the weekend or whenever we run the full on all machines and
> then report back again. Possible?
>
> Martin?
>
>>> Cc: Imre Deak <imre.deak@intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>>>   drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>>>   2 files changed, 10 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>> b/drivers/gpu/drm/i915/intel_csr.c
>>> index cf9b600..393d419 100644
>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>> @@ -34,6 +34,9 @@
>>>    * low-power state and comes back to normal.
>>>    */
>>>   
>>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>>> +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
>>> +
>>>   #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>>>   MODULE_FIRMWARE(I915_CSR_GLK);
>>>   #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
>>> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
>>> drm_i915_private *dev_priv,
>>>   	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>>>   		/* Bypass version check for firmware override. */
>>>   		required_version = csr->version;
>>> +	} else if (IS_ICELAKE(dev_priv)) {
>>> +		required_version = ICL_CSR_VERSION_REQUIRED;
>>>   	} else if (IS_CANNONLAKE(dev_priv)) {
>>>   		required_version = CNL_CSR_VERSION_REQUIRED;
>>>   	} else if (IS_GEMINILAKE(dev_priv)) {
>>> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private
>>> *dev_priv)
>>>   
>>>   	if (i915_modparams.dmc_firmware_path)
>>>   		csr->fw_path = i915_modparams.dmc_firmware_path;
>>> +	else if (IS_ICELAKE(dev_priv))
>>> +		csr->fw_path = I915_CSR_ICL;
>>>   	else if (IS_CANNONLAKE(dev_priv))
>>>   		csr->fw_path = I915_CSR_CNL;
>>>   	else if (IS_GEMINILAKE(dev_priv))
>>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> index cf89141..77c0986 100644
>>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
>>> drm_i915_private *dev_priv,
>>>   
>>>   	/* 7. Setup MBUS. */
>>>   	icl_mbus_init(dev_priv);
>>> +
>>> +	if (resume && dev_priv->csr.dmc_payload)
>>> +		intel_csr_load_program(dev_priv);
>>>   }
>>>   
>>>   static void icl_display_core_uninit(struct drm_i915_private
>>> *dev_priv)
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Tomi Sarvela]

On 08/02/2018 08:11 AM, Rodrigo Vivi wrote:
> On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
>> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
>>> Add Support to load DMC on Icelake.
>>>
>>> While at it, also add support to load the firmware
>>> during system resume.
>>>
>>> v2: load firmware during system resume.(Imre)
>>
>> Just to make it clear: did we test this on actual machines before
>> submitting or are we entirely relying on the CI results?
>>
>> I'm not sure the CI is running enough tests to validate this patch with
>> confidence, we'll probably need to do some manual testing here.
> 
> At some point I believe it was agreed that CI would test this
> and get the new firmware automatically from the cover-letter.
> 
> The problem is that I don't see any cover-letter so I'm afraid
> it is not running with the new firmware.
> 
> Tomi?

The requests can be checked from patchwork REST API:

https://patchwork.freedesktop.org/api/1.0/projects/intel-gfx/events/?page=1&name=pull-request-new

There has been a pull request for new firmware, but it couldn't be 
acted. CI can't connect to SSH repository, because those generally need 
an account. This has been tried and tested before. Better way is to use 
git://, http:// or https:// URLs, as the pull shouldn't need any special 
permissions.

This time I have manually pulled 
git://anongit.freedesktop.org/drm/drm-firmware/master but, if you want 
to make this automatic, the pull requests shouldn't be from repositories 
with obligatory login.

Another note: known firmware pull repositories are now

freedesktop.org	git://anongit.freedesktop.org/drm/drm-firmware (fetch)
g_anushasr	git://github.com/anushasr/linux-firmware.git (fetch)
h_anushasr	https://github.com/anushasr/linux-firmware.git (fetch)
kernel.org 
git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware 
(fetch)

If you know that in future there might be pull requests from another 
repository, please inform me about that in advance.

Tomi


> 
> Also I believe in case it has the cover letter it should run
> the full CI on the machine or at least stash it and run on
> the weekend or whenever we run the full on all machines and
> then report back again. Possible?
> 
> Martin?
> 
>>
>>>
>>> Cc: Imre Deak <imre.deak@intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>>>   drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>>>   2 files changed, 10 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>> b/drivers/gpu/drm/i915/intel_csr.c
>>> index cf9b600..393d419 100644
>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>> @@ -34,6 +34,9 @@
>>>    * low-power state and comes back to normal.
>>>    */
>>>   
>>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>>> +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
>>> +
>>>   #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>>>   MODULE_FIRMWARE(I915_CSR_GLK);
>>>   #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
>>> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
>>> drm_i915_private *dev_priv,
>>>   	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>>>   		/* Bypass version check for firmware override. */
>>>   		required_version = csr->version;
>>> +	} else if (IS_ICELAKE(dev_priv)) {
>>> +		required_version = ICL_CSR_VERSION_REQUIRED;
>>>   	} else if (IS_CANNONLAKE(dev_priv)) {
>>>   		required_version = CNL_CSR_VERSION_REQUIRED;
>>>   	} else if (IS_GEMINILAKE(dev_priv)) {
>>> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private
>>> *dev_priv)
>>>   
>>>   	if (i915_modparams.dmc_firmware_path)
>>>   		csr->fw_path = i915_modparams.dmc_firmware_path;
>>> +	else if (IS_ICELAKE(dev_priv))
>>> +		csr->fw_path = I915_CSR_ICL;
>>>   	else if (IS_CANNONLAKE(dev_priv))
>>>   		csr->fw_path = I915_CSR_CNL;
>>>   	else if (IS_GEMINILAKE(dev_priv))
>>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> index cf89141..77c0986 100644
>>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
>>> drm_i915_private *dev_priv,
>>>   
>>>   	/* 7. Setup MBUS. */
>>>   	icl_mbus_init(dev_priv);
>>> +
>>> +	if (resume && dev_priv->csr.dmc_payload)
>>> +		intel_csr_load_program(dev_priv);
>>>   }
>>>   
>>>   static void icl_display_core_uninit(struct drm_i915_private
>>> *dev_priv)
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx


Tomi
-- 
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

✓ Fi.CI.BAT: success for firmware/dmc/icl: load v1.07 on icelake. (rev2)

[Patchwork]

== Series Details ==

Series: firmware/dmc/icl: load v1.07 on icelake. (rev2)
URL   : https://patchwork.freedesktop.org/series/47450/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4605 -> Patchwork_9839 =

== Summary - SUCCESS ==

  No regressions found.

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

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@debugfs_test@read_all_entries:
      {fi-icl-u}:         NOTRUN -> DMESG-WARN (fdo#107396)

    igt@drv_selftest@live_guc:
      fi-skl-guc:         NOTRUN -> DMESG-WARN (fdo#107258, fdo#107175)

    igt@drv_selftest@live_hangcheck:
      {fi-icl-u}:         NOTRUN -> INCOMPLETE (fdo#107399)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      {fi-icl-u}:         NOTRUN -> DMESG-WARN (fdo#107382) +4

    {igt@kms_psr@primary_page_flip}:
      {fi-icl-u}:         NOTRUN -> FAIL (fdo#107383) +3

    
    ==== Possible fixes ====

    igt@drv_selftest@live_workarounds:
      {fi-bdw-samus}:     DMESG-FAIL (fdo#107292) -> PASS

    igt@prime_vgem@basic-fence-flip:
      fi-ilk-650:         FAIL (fdo#104008) -> PASS

    
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
  fdo#107175 https://bugs.freedesktop.org/show_bug.cgi?id=107175
  fdo#107258 https://bugs.freedesktop.org/show_bug.cgi?id=107258
  fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
  fdo#107382 https://bugs.freedesktop.org/show_bug.cgi?id=107382
  fdo#107383 https://bugs.freedesktop.org/show_bug.cgi?id=107383
  fdo#107396 https://bugs.freedesktop.org/show_bug.cgi?id=107396
  fdo#107399 https://bugs.freedesktop.org/show_bug.cgi?id=107399


== Participating hosts (50 -> 45) ==

  Additional (2): fi-skl-guc fi-icl-u 
  Missing    (7): fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper 


== Build changes ==

    * Linux: CI_DRM_4605 -> Patchwork_9839

  CI_DRM_4605: 50098198da758bdd54245d511f4f97236c296c72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4582: 263ca16e4d8909f475d32a28fc0e5972bac214fb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9839: 56d1d82c3d1f028586fce8d75dfc9040788d550d @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

56d1d82c3d1f firmware/dmc/icl: load v1.07 on icelake.

== Logs ==

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Tomi Sarvela]

On 08/02/2018 10:15 AM, Tomi Sarvela wrote:
> On 08/02/2018 08:11 AM, Rodrigo Vivi wrote:
>> On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
>>> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
>>>> Add Support to load DMC on Icelake.
>>>>
>>>> While at it, also add support to load the firmware
>>>> during system resume.
>>>>
>>>> v2: load firmware during system resume.(Imre)
>>>
>>> Just to make it clear: did we test this on actual machines before
>>> submitting or are we entirely relying on the CI results?
>>>
>>> I'm not sure the CI is running enough tests to validate this patch with
>>> confidence, we'll probably need to do some manual testing here.
>>
>> At some point I believe it was agreed that CI would test this
>> and get the new firmware automatically from the cover-letter.
>>
>> The problem is that I don't see any cover-letter so I'm afraid
>> it is not running with the new firmware.
>>
>> Tomi?
> 
> The requests can be checked from patchwork REST API:
> 
> https://patchwork.freedesktop.org/api/1.0/projects/intel-gfx/events/?page=1&name=pull-request-new 
> 
> 
> There has been a pull request for new firmware, but it couldn't be 
> acted. CI can't connect to SSH repository, because those generally need 
> an account. This has been tried and tested before. Better way is to use 
> git://, http:// or https:// URLs, as the pull shouldn't need any special 
> permissions.
> 
> This time I have manually pulled 
> git://anongit.freedesktop.org/drm/drm-firmware/master but, if you want 
> to make this automatic, the pull requests shouldn't be from repositories 
> with obligatory login.
> 
> Another note: known firmware pull repositories are now
> 
> freedesktop.org    git://anongit.freedesktop.org/drm/drm-firmware (fetch)
> g_anushasr    git://github.com/anushasr/linux-firmware.git (fetch)
> h_anushasr    https://github.com/anushasr/linux-firmware.git (fetch)
> kernel.org 
> git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware 
> (fetch)
> 
> If you know that in future there might be pull requests from another 
> repository, please inform me about that in advance.

The results from the re-tested patchset are back, with dmesgs:

https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9839/fi-icl-u/boot0.log

https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9839/fi-icl-u/dmesg0.log

Testrun hung in igt@drv_selftest@live_hangcheck, which is standard place 
for ICL to rest in peace.

https://intel-gfx-ci.01.org/tree/drm-tip/fi-icl-u.html

Tomi



> 
>>
>> Also I believe in case it has the cover letter it should run
>> the full CI on the machine or at least stash it and run on
>> the weekend or whenever we run the full on all machines and
>> then report back again. Possible?
>>
>> Martin?
>>
>>>
>>>>
>>>> Cc: Imre Deak <imre.deak@intel.com>
>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>>> ---
>>>>   drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>>>>   drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>>>>   2 files changed, 10 insertions(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>>> b/drivers/gpu/drm/i915/intel_csr.c
>>>> index cf9b600..393d419 100644
>>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>>> @@ -34,6 +34,9 @@
>>>>    * low-power state and comes back to normal.
>>>>    */
>>>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>>>> +#define ICL_CSR_VERSION_REQUIRED    CSR_VERSION(1, 7)
>>>> +
>>>>   #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>>>>   MODULE_FIRMWARE(I915_CSR_GLK);
>>>>   #define GLK_CSR_VERSION_REQUIRED    CSR_VERSION(1, 4)
>>>> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
>>>> drm_i915_private *dev_priv,
>>>>       if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>>>>           /* Bypass version check for firmware override. */
>>>>           required_version = csr->version;
>>>> +    } else if (IS_ICELAKE(dev_priv)) {
>>>> +        required_version = ICL_CSR_VERSION_REQUIRED;
>>>>       } else if (IS_CANNONLAKE(dev_priv)) {
>>>>           required_version = CNL_CSR_VERSION_REQUIRED;
>>>>       } else if (IS_GEMINILAKE(dev_priv)) {
>>>> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private
>>>> *dev_priv)
>>>>       if (i915_modparams.dmc_firmware_path)
>>>>           csr->fw_path = i915_modparams.dmc_firmware_path;
>>>> +    else if (IS_ICELAKE(dev_priv))
>>>> +        csr->fw_path = I915_CSR_ICL;
>>>>       else if (IS_CANNONLAKE(dev_priv))
>>>>           csr->fw_path = I915_CSR_CNL;
>>>>       else if (IS_GEMINILAKE(dev_priv))
>>>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> index cf89141..77c0986 100644
>>>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
>>>> drm_i915_private *dev_priv,
>>>>       /* 7. Setup MBUS. */
>>>>       icl_mbus_init(dev_priv);
>>>> +
>>>> +    if (resume && dev_priv->csr.dmc_payload)
>>>> +        intel_csr_load_program(dev_priv);
>>>>   }
>>>>   static void icl_display_core_uninit(struct drm_i915_private
>>>> *dev_priv)
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
> Tomi


Tomi
-- 
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

✓ Fi.CI.IGT: success for firmware/dmc/icl: load v1.07 on icelake. (rev2)

[Patchwork]

== Series Details ==

Series: firmware/dmc/icl: load v1.07 on icelake. (rev2)
URL   : https://patchwork.freedesktop.org/series/47450/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4605_full -> Patchwork_9839_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_suspend@shrink:
      shard-apl:          PASS -> INCOMPLETE (fdo#103927, fdo#106886)

    igt@gem_userptr_blits@create-destroy-sync:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411)

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105363)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665)

    
    ==== Possible fixes ====

    igt@kms_setmode@basic:
      shard-apl:          FAIL (fdo#99912) -> PASS
      shard-kbl:          FAIL (fdo#99912) -> PASS

    
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
  fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
  fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


== Participating hosts (5 -> 5) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4605 -> Patchwork_9839

  CI_DRM_4605: 50098198da758bdd54245d511f4f97236c296c72 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4582: 263ca16e4d8909f475d32a28fc0e5972bac214fb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9839: 56d1d82c3d1f028586fce8d75dfc9040788d550d @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Srivatsa, Anusha]

>-----Original Message-----
>From: Sarvela, Tomi P
>Sent: Thursday, August 2, 2018 12:51 AM
>To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Zanoni, Paulo R
><paulo.r.zanoni@intel.com>
>Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
>gfx@lists.freedesktop.org; Martin Peres <martin.peres@linux.intel.com>
>Subject: Re: [Intel-gfx] [PATCH] firmware/dmc/icl: load v1.07 on icelake.
>
>On 08/02/2018 10:15 AM, Tomi Sarvela wrote:
>> On 08/02/2018 08:11 AM, Rodrigo Vivi wrote:
>>> On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
>>>> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
>>>>> Add Support to load DMC on Icelake.
>>>>>
>>>>> While at it, also add support to load the firmware during system
>>>>> resume.
>>>>>
>>>>> v2: load firmware during system resume.(Imre)
>>>>
>>>> Just to make it clear: did we test this on actual machines before
>>>> submitting or are we entirely relying on the CI results?
>>>>
>>>> I'm not sure the CI is running enough tests to validate this patch
>>>> with confidence, we'll probably need to do some manual testing here.
>>>
>>> At some point I believe it was agreed that CI would test this and get
>>> the new firmware automatically from the cover-letter.
>>>
>>> The problem is that I don't see any cover-letter so I'm afraid it is
>>> not running with the new firmware.
>>>
>>> Tomi?
>>
>> The requests can be checked from patchwork REST API:
>>
>> https://patchwork.freedesktop.org/api/1.0/projects/intel-gfx/events/?p
>> age=1&name=pull-request-new
>>
>>
>> There has been a pull request for new firmware, but it couldn't be
>> acted. CI can't connect to SSH repository, because those generally
>> need an account. This has been tried and tested before. Better way is
>> to use git://, http:// or https:// URLs, as the pull shouldn't need
>> any special permissions.
>>
>> This time I have manually pulled
>> git://anongit.freedesktop.org/drm/drm-firmware/master but, if you want
>> to make this automatic, the pull requests shouldn't be from
>> repositories with obligatory login.
>>
>> Another note: known firmware pull repositories are now
>>
>> freedesktop.org    git://anongit.freedesktop.org/drm/drm-firmware
>> (fetch) g_anushasr    git://github.com/anushasr/linux-firmware.git
>> (fetch) h_anushasr    https://github.com/anushasr/linux-firmware.git
>> (fetch) kernel.org
>> git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware
>> (fetch)
>>
>> If you know that in future there might be pull requests from another
>> repository, please inform me about that in advance.
>
>The results from the re-tested patchset are back, with dmesgs:
>
>https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9839/fi-icl-u/boot0.log
>
>https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9839/fi-icl-u/dmesg0.log
>
>Testrun hung in igt@drv_selftest@live_hangcheck, which is standard place for ICL
>to rest in peace.
>
>https://intel-gfx-ci.01.org/tree/drm-tip/fi-icl-u.html
>
>Tomi
>
>
>
>>
>>>
>>> Also I believe in case it has the cover letter it should run the full
>>> CI on the machine or at least stash it and run on the weekend or
>>> whenever we run the full on all machines and then report back again.
>>> Possible?
>>> Martin?

For Firmware patches, it would be nice to have the whole IGT running with the patch ofcourse. Martin, Tomi is  this possible?

Anusha 

>>>>
>>>>>
>>>>> Cc: Imre Deak <imre.deak@intel.com>
>>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>>>> ---
>>>>>   drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>>>>>   drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>>>>>   2 files changed, 10 insertions(+)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>>>> b/drivers/gpu/drm/i915/intel_csr.c
>>>>> index cf9b600..393d419 100644
>>>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>>>> @@ -34,6 +34,9 @@
>>>>>    * low-power state and comes back to normal.
>>>>>    */
>>>>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>>>>> +#define ICL_CSR_VERSION_REQUIRED    CSR_VERSION(1, 7)
>>>>> +
>>>>>   #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>>>>>   MODULE_FIRMWARE(I915_CSR_GLK);
>>>>>   #define GLK_CSR_VERSION_REQUIRED    CSR_VERSION(1, 4) @@ -301,6
>>>>> +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private
>>>>> *dev_priv,
>>>>>       if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>>>>>           /* Bypass version check for firmware override. */
>>>>>           required_version = csr->version;
>>>>> +    } else if (IS_ICELAKE(dev_priv)) {
>>>>> +        required_version = ICL_CSR_VERSION_REQUIRED;
>>>>>       } else if (IS_CANNONLAKE(dev_priv)) {
>>>>>           required_version = CNL_CSR_VERSION_REQUIRED;
>>>>>       } else if (IS_GEMINILAKE(dev_priv)) { @@ -458,6 +463,8 @@
>>>>> void intel_csr_ucode_init(struct drm_i915_private
>>>>> *dev_priv)
>>>>>       if (i915_modparams.dmc_firmware_path)
>>>>>           csr->fw_path = i915_modparams.dmc_firmware_path;
>>>>> +    else if (IS_ICELAKE(dev_priv))
>>>>> +        csr->fw_path = I915_CSR_ICL;
>>>>>       else if (IS_CANNONLAKE(dev_priv))
>>>>>           csr->fw_path = I915_CSR_CNL;
>>>>>       else if (IS_GEMINILAKE(dev_priv)) diff --git
>>>>> a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>>> index cf89141..77c0986 100644
>>>>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>>> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
>>>>> drm_i915_private *dev_priv,
>>>>>       /* 7. Setup MBUS. */
>>>>>       icl_mbus_init(dev_priv);
>>>>> +
>>>>> +    if (resume && dev_priv->csr.dmc_payload)
>>>>> +        intel_csr_load_program(dev_priv);
>>>>>   }
>>>>>   static void icl_display_core_uninit(struct drm_i915_private
>>>>> *dev_priv)
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>>
>> Tomi
>
>
>Tomi
>--
>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] firmware/dmc/icl: load v1.07 on icelake.

[Srivatsa, Anusha]

>-----Original Message-----
>From: Yadav, Jyoti R
>Sent: Wednesday, August 1, 2018 10:34 PM
>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
>gfx@lists.freedesktop.org; Zanoni, Paulo R <paulo.r.zanoni@intel.com>
>Cc: Sarvela, Tomi P <tomi.p.sarvela@intel.com>; Vivi, Rodrigo
><rodrigo.vivi@intel.com>; Zanoni, Paulo R <paulo.r.zanoni@intel.com>; intel-
>gfx@lists.freedesktop.org
>Subject: Re: [Intel-gfx] [PATCH] firmware/dmc/icl: load v1.07 on icelake.
>
>Hi Anusha,
>
>I think we should also add "HAS_CSR" capability, which is being exercised inside
>intel_csr_ucode_init() path.

Yes you are right :)
Thanks for pointing it.

>For ICL, inside intel_device_info structure we should add has_csr = 1, otherwise
>below check will fail and function will return from there itself.
>
>if (!HAS_CSR(dev_priv))
>                 return;
That is what is happening according to the logs.

Rodrigo, Paulo : The has_csr = 1 should be a separate patch though. 
This patch should just try and load the blob and has_csr patch has to enable csr on ICL.

Anusha
>Regards
>Jyoti
>On 8/2/2018 10:41 AM, Rodrigo Vivi wrote:
>> On Wed, Aug 01, 2018 at 05:30:49PM -0700, Paulo Zanoni wrote:
>>> Em Qua, 2018-08-01 às 17:07 -0700, Anusha Srivatsa escreveu:
>>>> Add Support to load DMC on Icelake.
>>>>
>>>> While at it, also add support to load the firmware during system
>>>> resume.
>>>>
>>>> v2: load firmware during system resume.(Imre)
>>> Just to make it clear: did we test this on actual machines before
>>> submitting or are we entirely relying on the CI results?
>>>
>>> I'm not sure the CI is running enough tests to validate this patch
>>> with confidence, we'll probably need to do some manual testing here.
>> At some point I believe it was agreed that CI would test this and get
>> the new firmware automatically from the cover-letter.
>>
>> The problem is that I don't see any cover-letter so I'm afraid it is
>> not running with the new firmware.
>>
>> Tomi?
>>
>> Also I believe in case it has the cover letter it should run the full
>> CI on the machine or at least stash it and run on the weekend or
>> whenever we run the full on all machines and then report back again.
>> Possible?
>>
>> Martin?
>>
>>>> Cc: Imre Deak <imre.deak@intel.com>
>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
>>>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>>> ---
>>>>   drivers/gpu/drm/i915/intel_csr.c        | 7 +++++++
>>>>   drivers/gpu/drm/i915/intel_runtime_pm.c | 3 +++
>>>>   2 files changed, 10 insertions(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>>> b/drivers/gpu/drm/i915/intel_csr.c
>>>> index cf9b600..393d419 100644
>>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>>> @@ -34,6 +34,9 @@
>>>>    * low-power state and comes back to normal.
>>>>    */
>>>>
>>>> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
>>>> +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
>>>> +
>>>>   #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>>>>   MODULE_FIRMWARE(I915_CSR_GLK);
>>>>   #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
>>>> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct
>>>> drm_i915_private *dev_priv,
>>>>   	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>>>>   		/* Bypass version check for firmware override. */
>>>>   		required_version = csr->version;
>>>> +	} else if (IS_ICELAKE(dev_priv)) {
>>>> +		required_version = ICL_CSR_VERSION_REQUIRED;
>>>>   	} else if (IS_CANNONLAKE(dev_priv)) {
>>>>   		required_version = CNL_CSR_VERSION_REQUIRED;
>>>>   	} else if (IS_GEMINILAKE(dev_priv)) { @@ -458,6 +463,8 @@ void
>>>> intel_csr_ucode_init(struct drm_i915_private
>>>> *dev_priv)
>>>>
>>>>   	if (i915_modparams.dmc_firmware_path)
>>>>   		csr->fw_path = i915_modparams.dmc_firmware_path;
>>>> +	else if (IS_ICELAKE(dev_priv))
>>>> +		csr->fw_path = I915_CSR_ICL;
>>>>   	else if (IS_CANNONLAKE(dev_priv))
>>>>   		csr->fw_path = I915_CSR_CNL;
>>>>   	else if (IS_GEMINILAKE(dev_priv)) diff --git
>>>> a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> index cf89141..77c0986 100644
>>>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>>>> @@ -3372,6 +3372,9 @@ static void icl_display_core_init(struct
>>>> drm_i915_private *dev_priv,
>>>>
>>>>   	/* 7. Setup MBUS. */
>>>>   	icl_mbus_init(dev_priv);
>>>> +
>>>> +	if (resume && dev_priv->csr.dmc_payload)
>>>> +		intel_csr_load_program(dev_priv);
>>>>   }
>>>>
>>>>   static void icl_display_core_uninit(struct drm_i915_private
>>>> *dev_priv)
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Imre Deak]

On Mon, Jul 30, 2018 at 04:57:11PM -0700, Anusha Srivatsa wrote:
> Add Support to load DMC on Icelake.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
>  1 file changed, 7 insertions(+)

the firmware also needs to be loaded during runtime/system resume, by adding
the following to icl_display_core_init(), similarly to other platforms:

	if (resume && dev_priv->csr.dmc_payload)
		intel_csr_load_program(dev_priv);

> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index cf9b600..393d419 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -34,6 +34,9 @@
>   * low-power state and comes back to normal.
>   */
>  
> +#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
> +#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
> +
>  #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
>  MODULE_FIRMWARE(I915_CSR_GLK);
>  #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
> @@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
>  	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
>  		/* Bypass version check for firmware override. */
>  		required_version = csr->version;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		required_version = ICL_CSR_VERSION_REQUIRED;
>  	} else if (IS_CANNONLAKE(dev_priv)) {
>  		required_version = CNL_CSR_VERSION_REQUIRED;
>  	} else if (IS_GEMINILAKE(dev_priv)) {
> @@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
>  
>  	if (i915_modparams.dmc_firmware_path)
>  		csr->fw_path = i915_modparams.dmc_firmware_path;
> +	else if (IS_ICELAKE(dev_priv))
> +		csr->fw_path = I915_CSR_ICL;
>  	else if (IS_CANNONLAKE(dev_priv))
>  		csr->fw_path = I915_CSR_CNL;
>  	else if (IS_GEMINILAKE(dev_priv))
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH] firmware/dmc/icl: load v1.07 on icelake.

[Anusha Srivatsa]

Add Support to load DMC on Icelake.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index cf9b600..393d419 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,9 @@
  * low-power state and comes back to normal.
  */
 
+#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
+#define ICL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 7)
+
 #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
 MODULE_FIRMWARE(I915_CSR_GLK);
 #define GLK_CSR_VERSION_REQUIRED	CSR_VERSION(1, 4)
@@ -301,6 +304,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
 		/* Bypass version check for firmware override. */
 		required_version = csr->version;
+	} else if (IS_ICELAKE(dev_priv)) {
+		required_version = ICL_CSR_VERSION_REQUIRED;
 	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
@@ -458,6 +463,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 
 	if (i915_modparams.dmc_firmware_path)
 		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_ICELAKE(dev_priv))
+		csr->fw_path = I915_CSR_ICL;
 	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
-- 
2.7.4

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