[PATCH] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[PATCH] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[Jyoti Yadav]

As DMC Package contain DMC FW for multiple steppings including default
stepping. This patch will help to load FW for that particular stepping,
if FW for that stepping is available, instead of loading default FW.

v2 : Fix formatting issue.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 1ec4f09..5c467f2 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -184,6 +184,12 @@ struct stepping_info {
 	{'B', '0'}, {'B', '1'}, {'B', '2'}
 };
 
+static const struct stepping_info icl_stepping_info[] = {
+	{'A', '0'}, {'A', '1'}, {'A', '2'},
+	{'B', '0'}, {'B', '2'},
+	{'C', '0'}
+};
+
 static const struct stepping_info no_stepping_info = { '*', '*' };
 
 static const struct stepping_info *
@@ -192,7 +198,10 @@ struct stepping_info {
 	const struct stepping_info *si;
 	unsigned int size;
 
-	if (IS_SKYLAKE(dev_priv)) {
+	if (IS_ICELAKE(dev_priv)) {
+		size = ARRAY_SIZE(icl_stepping_info);
+		si = icl_stepping_info;
+	} else if (IS_SKYLAKE(dev_priv)) {
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;
 	} else if (IS_BROXTON(dev_priv)) {
-- 
1.9.1

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

✓ Fi.CI.BAT: success for drm/i915/intel_csr.c Added ICL Stepping info. (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/intel_csr.c Added ICL Stepping info. (rev2)
URL   : https://patchwork.freedesktop.org/series/49058/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4773 -> Patchwork_10098 =

== Summary - SUCCESS ==

  No regressions found.

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

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_suspend@basic-s3:
      fi-byt-clapper:     PASS -> INCOMPLETE (fdo#102657)

    igt@kms_psr@primary_page_flip:
      fi-cnl-psr:         PASS -> FAIL (fdo#107336)

    
    ==== Possible fixes ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

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

    
  fdo#102657 https://bugs.freedesktop.org/show_bug.cgi?id=102657
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
  fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718


== Participating hosts (54 -> 49) ==

  Missing    (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u 


== Build changes ==

    * Linux: CI_DRM_4773 -> Patchwork_10098

  CI_DRM_4773: fb94a684a02a423798c1c773cf2ca9d5a7a94fb7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4630: 86686c6e2f7c6f0944bced11550e06d20bc6957f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10098: 647b1f427344d72cfa29857edb4c3b89842c607d @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

647b1f427344 drm/i915/intel_csr.c Added ICL Stepping info.

== Logs ==

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

✓ Fi.CI.IGT: success for drm/i915/intel_csr.c Added ICL Stepping info. (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/intel_csr.c Added ICL Stepping info. (rev2)
URL   : https://patchwork.freedesktop.org/series/49058/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4773_full -> Patchwork_10098_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

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

    
    ==== Possible fixes ====

    igt@drv_suspend@shrink:
      shard-glk:          FAIL (fdo#106886) -> PASS

    igt@kms_cursor_crc@cursor-64x64-suspend:
      shard-apl:          INCOMPLETE (fdo#103927) -> PASS

    igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
      shard-hsw:          FAIL (fdo#105767) -> PASS

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

    
  fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
  fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
  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_4773 -> Patchwork_10098

  CI_DRM_4773: fb94a684a02a423798c1c773cf2ca9d5a7a94fb7 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4630: 86686c6e2f7c6f0944bced11550e06d20bc6957f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10098: 647b1f427344d72cfa29857edb4c3b89842c607d @ 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_10098/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✓ Fi.CI.IGT: success for drm/i915/intel_csr.c Added ICL Stepping info. (rev2)

[Imre Deak]

On Thu, Sep 06, 2018 at 12:15:30AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/intel_csr.c Added ICL Stepping info. (rev2)
> URL   : https://patchwork.freedesktop.org/series/49058/
> State : success

Thanks for the patch pushed to -dinq.

For the future: for the one line description please use a tag in the
drm/i915/<short description>:
format. I changed it for this patch while applying it.

> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_4773_full -> Patchwork_10098_full =
> 
> == Summary - SUCCESS ==
> 
>   No regressions found.
> 
>   
> 
> == Known issues ==
> 
>   Here are the changes found in Patchwork_10098_full that come from known issues:
> 
>   === IGT changes ===
> 
>     ==== Issues hit ====
> 
>     igt@kms_setmode@basic:
>       shard-kbl:          PASS -> FAIL (fdo#99912)
> 
>     
>     ==== Possible fixes ====
> 
>     igt@drv_suspend@shrink:
>       shard-glk:          FAIL (fdo#106886) -> PASS
> 
>     igt@kms_cursor_crc@cursor-64x64-suspend:
>       shard-apl:          INCOMPLETE (fdo#103927) -> PASS
> 
>     igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
>       shard-hsw:          FAIL (fdo#105767) -> PASS
> 
>     igt@kms_flip@flip-vs-expired-vblank-interruptible:
>       shard-glk:          FAIL (fdo#105363, fdo#102887) -> PASS
> 
>     
>   fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
>   fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
>   fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
>   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_4773 -> Patchwork_10098
> 
>   CI_DRM_4773: fb94a684a02a423798c1c773cf2ca9d5a7a94fb7 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4630: 86686c6e2f7c6f0944bced11550e06d20bc6957f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_10098: 647b1f427344d72cfa29857edb4c3b89842c607d @ 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_10098/shards.html
> _______________________________________________
> 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] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[Imre Deak]

On Mon, Sep 03, 2018 at 03:45:13AM -0400, Jyoti Yadav wrote:
> As DMC Package contain DMC FW for multiple steppings including default
> stepping. This patch will help to load FW for that particular stepping,
> if FW for that stepping is available, instead of loading default FW.
> 
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_csr.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index 1ec4f09..f6352ab 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -183,6 +183,11 @@ struct stepping_info {
>  	{'A', '0'}, {'A', '1'}, {'A', '2'},
>  	{'B', '0'}, {'B', '1'}, {'B', '2'}
>  };
> +static const struct stepping_info icl_stepping_info[] = {
> +	{'A', '0'}, {'A', '1'}, {'A', '2'},

Looks like the PCI revision ID for A1 and A2 is missing/typoed in BSpec,
but these are probably the correct values in any case. The current
firmware has an 'A','*' entry for all A steppings, so that works out
too.

> +	{'B', '0'}, {'B', '2'},
> +	{'C', '0'}
> +};
>  
>  static const struct stepping_info no_stepping_info = { '*', '*' };
>  
> @@ -198,6 +203,9 @@ struct stepping_info {
>  	} else if (IS_BROXTON(dev_priv)) {
>  		size = ARRAY_SIZE(bxt_stepping_info);
>  		si = bxt_stepping_info;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		size = ARRAY_SIZE(icl_stepping_info);
> +		si = icl_stepping_info;

While fixing the formatting asked by Rodrigo, could you also keep the
new->old platform order and so make this and icl_stepping_info be the
first in the list?

With those looks ok:
Reviewed-by: Imre Deak <imre.deak@intel.com>

>  	} else {
>  		size = 0;
>  		si = NULL;
> -- 
> 1.9.1
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[Yadav, Jyoti R]

Yeah, Thanks for the "Acked-by" Rodrigo.

I request Imre/Anusha to review/acknowledge the same.

Regards
Jyoti

-----Original Message-----
From: Vivi, Rodrigo 
Sent: Tuesday, September 4, 2018 11:02 AM
To: Yadav, Jyoti R <jyoti.r.yadav@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

On Mon, Sep 03, 2018 at 03:45:13AM -0400, Jyoti Yadav wrote:
> As DMC Package contain DMC FW for multiple steppings including default 
> stepping. This patch will help to load FW for that particular 
> stepping, if FW for that stepping is available, instead of loading default FW.
> 

Cc: Imre Deak <imre.deak@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>

I'm not sure if I can properly review this, but based on previous platforms patch lgtm.

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

I'm just not pushing because I'd like an ack from Anusha and/or Imre.

> ---
>  drivers/gpu/drm/i915/intel_csr.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c 
> b/drivers/gpu/drm/i915/intel_csr.c
> index 1ec4f09..f6352ab 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -183,6 +183,11 @@ struct stepping_info {
>  	{'A', '0'}, {'A', '1'}, {'A', '2'},
>  	{'B', '0'}, {'B', '1'}, {'B', '2'}
>  };

nip by checkpatch: missing blank line here.

> +static const struct stepping_info icl_stepping_info[] = {
> +	{'A', '0'}, {'A', '1'}, {'A', '2'},
> +	{'B', '0'}, {'B', '2'},
> +	{'C', '0'}
> +};
>  
>  static const struct stepping_info no_stepping_info = { '*', '*' };
>  
> @@ -198,6 +203,9 @@ struct stepping_info {
>  	} else if (IS_BROXTON(dev_priv)) {
>  		size = ARRAY_SIZE(bxt_stepping_info);
>  		si = bxt_stepping_info;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		size = ARRAY_SIZE(icl_stepping_info);
> +		si = icl_stepping_info;
>  	} else {
>  		size = 0;
>  		si = NULL;
> --
> 1.9.1
> 
> _______________________________________________
> 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] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[Rodrigo Vivi]

On Mon, Sep 03, 2018 at 03:45:13AM -0400, Jyoti Yadav wrote:
> As DMC Package contain DMC FW for multiple steppings including default
> stepping. This patch will help to load FW for that particular stepping,
> if FW for that stepping is available, instead of loading default FW.
> 

Cc: Imre Deak <imre.deak@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>

I'm not sure if I can properly review this, but based on previous
platforms patch lgtm.

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

I'm just not pushing because I'd like an ack from Anusha and/or Imre.

> ---
>  drivers/gpu/drm/i915/intel_csr.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index 1ec4f09..f6352ab 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -183,6 +183,11 @@ struct stepping_info {
>  	{'A', '0'}, {'A', '1'}, {'A', '2'},
>  	{'B', '0'}, {'B', '1'}, {'B', '2'}
>  };

nip by checkpatch: missing blank line here.

> +static const struct stepping_info icl_stepping_info[] = {
> +	{'A', '0'}, {'A', '1'}, {'A', '2'},
> +	{'B', '0'}, {'B', '2'},
> +	{'C', '0'}
> +};
>  
>  static const struct stepping_info no_stepping_info = { '*', '*' };
>  
> @@ -198,6 +203,9 @@ struct stepping_info {
>  	} else if (IS_BROXTON(dev_priv)) {
>  		size = ARRAY_SIZE(bxt_stepping_info);
>  		si = bxt_stepping_info;
> +	} else if (IS_ICELAKE(dev_priv)) {
> +		size = ARRAY_SIZE(icl_stepping_info);
> +		si = icl_stepping_info;
>  	} else {
>  		size = 0;
>  		si = NULL;
> -- 
> 1.9.1
> 
> _______________________________________________
> 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] [intel-gfx] drm/i915/intel_csr.c Added ICL Stepping info.

[Jyoti Yadav]

As DMC Package contain DMC FW for multiple steppings including default
stepping. This patch will help to load FW for that particular stepping,
if FW for that stepping is available, instead of loading default FW.

Signed-off-by: Jyoti Yadav <jyoti.r.yadav@intel.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 1ec4f09..f6352ab 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -183,6 +183,11 @@ struct stepping_info {
 	{'A', '0'}, {'A', '1'}, {'A', '2'},
 	{'B', '0'}, {'B', '1'}, {'B', '2'}
 };
+static const struct stepping_info icl_stepping_info[] = {
+	{'A', '0'}, {'A', '1'}, {'A', '2'},
+	{'B', '0'}, {'B', '2'},
+	{'C', '0'}
+};
 
 static const struct stepping_info no_stepping_info = { '*', '*' };
 
@@ -198,6 +203,9 @@ struct stepping_info {
 	} else if (IS_BROXTON(dev_priv)) {
 		size = ARRAY_SIZE(bxt_stepping_info);
 		si = bxt_stepping_info;
+	} else if (IS_ICELAKE(dev_priv)) {
+		size = ARRAY_SIZE(icl_stepping_info);
+		si = icl_stepping_info;
 	} else {
 		size = 0;
 		si = NULL;
-- 
1.9.1

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