[PATCH] drm/i915/psr: Adds psrwake options for all platforms

[PATCH] drm/i915/psr: Adds psrwake options for all platforms

[vathsala nagaraju]

From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>

Adds new psrwake options defined in the below table.
Platform	PSR wake options vbt version
KBL/CFL/WHL	All
SKL		All PV releases (Check for 203+ might help but cannot be foolproof)
BXT		Uses old interpretation.
CNL/ICL+	All
GLK		All

For SKL, we will continue to use older interpretation for the above reason.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Puthikorn Voravootivat <puthik@chromium.org>
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>

Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
---
 drivers/gpu/drm/i915/intel_bios.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 465dff4..010ff68 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
 	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
 	 * Old decimal value is wake up time in multiples of 100 us.
 	 */
-	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
+	if ((INTEL_GEN(dev_priv) >= 10) ||
+	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {
 		switch (psr_table->tp1_wakeup_time) {
 		case 0:
 			dev_priv->vbt.psr.tp1_wakeup_time_us = 500;
-- 
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/psr: Adds psrwake options for all platforms

[Patchwork]

== Series Details ==

Series: drm/i915/psr: Adds psrwake options for all platforms
URL   : https://patchwork.freedesktop.org/series/44601/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4304 -> Patchwork_9267 =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_9267 need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_9267, 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/44601/revisions/1/mbox/

== Possible new issues ==

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

  === IGT changes ===

    ==== Warnings ====

    igt@gem_exec_gttfill@basic:
      fi-pnv-d510:        SKIP -> PASS

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_module_reload@basic-reload-inject:
      fi-glk-j4005:       PASS -> DMESG-WARN (fdo#106248, fdo#106725)

    igt@gem_exec_gttfill@basic:
      fi-byt-n2820:       PASS -> FAIL (fdo#106744)

    igt@kms_flip@basic-flip-vs-dpms:
      fi-glk-j4005:       PASS -> DMESG-WARN (fdo#106000)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-snb-2520m:       PASS -> INCOMPLETE (fdo#103713)

    
    ==== Possible fixes ====

    igt@kms_flip@basic-flip-vs-modeset:
      fi-glk-j4005:       DMESG-WARN (fdo#106000) -> PASS

    igt@kms_flip@basic-plain-flip:
      fi-glk-j4005:       DMESG-WARN (fdo#106097) -> PASS +1

    
  fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
  fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
  fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
  fdo#106248 https://bugs.freedesktop.org/show_bug.cgi?id=106248
  fdo#106725 https://bugs.freedesktop.org/show_bug.cgi?id=106725
  fdo#106744 https://bugs.freedesktop.org/show_bug.cgi?id=106744


== Participating hosts (42 -> 36) ==

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


== Build changes ==

    * Linux: CI_DRM_4304 -> Patchwork_9267

  CI_DRM_4304: 2313a1dc588ef63d9650ccbaaf576bc4b47dc255 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4515: a0f2d23b7d3d4226a0a7637a9240bfa86f08c1d3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9267: 89cce6d3ac2261f69f7e3fec06bcbcbf9244175a @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

89cce6d3ac22 drm/i915/psr: Adds psrwake options for all platforms

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9267/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/psr: Adds psrwake options for all platforms

[Patchwork]

== Series Details ==

Series: drm/i915/psr: Adds psrwake options for all platforms
URL   : https://patchwork.freedesktop.org/series/44601/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4304_full -> Patchwork_9267_full =

== Summary - WARNING ==

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

  

== Possible new issues ==

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

  === IGT changes ===

    ==== Warnings ====

    igt@gem_exec_schedule@deep-blt:
      shard-kbl:          PASS -> SKIP

    igt@gem_exec_schedule@deep-bsd1:
      shard-kbl:          SKIP -> PASS

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_big:
      shard-hsw:          PASS -> INCOMPLETE (fdo#103540)

    igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd1:
      shard-kbl:          PASS -> DMESG-WARN (fdo#106353)

    igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
      shard-glk:          PASS -> FAIL (fdo#105703)

    igt@kms_cursor_legacy@cursor-vs-flip-varying-size:
      shard-hsw:          PASS -> FAIL (fdo#103355)

    igt@kms_flip@2x-flip-vs-expired-vblank:
      shard-hsw:          PASS -> FAIL (fdo#102887)

    igt@kms_flip@plain-flip-fb-recreate-interruptible:
      shard-glk:          PASS -> FAIL (fdo#100368)

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-glk:          PASS -> FAIL (fdo#104724)

    igt@kms_flip_tiling@flip-x-tiled:
      shard-glk:          PASS -> FAIL (fdo#103822, fdo#104724) +1

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
      shard-hsw:          PASS -> FAIL (fdo#103481)

    igt@perf@blocking:
      shard-hsw:          PASS -> FAIL (fdo#102252)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_gtt:
      shard-kbl:          FAIL (fdo#105347) -> PASS
      shard-glk:          INCOMPLETE (k.org#198133, fdo#103359) -> PASS +1

    igt@drv_suspend@shrink:
      shard-hsw:          INCOMPLETE (fdo#103540) -> PASS

    igt@kms_flip@plain-flip-fb-recreate:
      shard-glk:          FAIL (fdo#100368) -> PASS

    igt@kms_rotation_crc@sprite-rotation-180:
      shard-hsw:          FAIL (fdo#104724, fdo#103925) -> PASS

    
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
  fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
  fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
  fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
  fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
  fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
  fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
  fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
  fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
  fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
  fdo#105703 https://bugs.freedesktop.org/show_bug.cgi?id=105703
  fdo#106353 https://bugs.freedesktop.org/show_bug.cgi?id=106353
  k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133


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

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4304 -> Patchwork_9267

  CI_DRM_4304: 2313a1dc588ef63d9650ccbaaf576bc4b47dc255 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4515: a0f2d23b7d3d4226a0a7637a9240bfa86f08c1d3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_9267: 89cce6d3ac2261f69f7e3fec06bcbcbf9244175a @ 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_9267/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Jani Nikula]

On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel.com> wrote:
> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>
> Adds new psrwake options defined in the below table.
> Platform	PSR wake options vbt version
> KBL/CFL/WHL	All
> SKL		All PV releases (Check for 203+ might help but cannot be foolproof)
> BXT		Uses old interpretation.
> CNL/ICL+	All
> GLK		All
>
> For SKL, we will continue to use older interpretation for the above reason.
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Puthikorn Voravootivat <puthik@chromium.org>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>
> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 465dff4..010ff68 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
>  	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
>  	 * Old decimal value is wake up time in multiples of 100 us.
>  	 */
> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
> +	if ((INTEL_GEN(dev_priv) >= 10) ||
> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {

Please keep the version check.

Please tell anyone who asks, and also those who don't, that *all* of the
VBT changes should be based on the *version*, and *none* of them should
be based on the *platform*.

BR,
Jani.

>  		switch (psr_table->tp1_wakeup_time) {
>  		case 0:
>  			dev_priv->vbt.psr.tp1_wakeup_time_us = 500;

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Nagaraju, Vathsala]

On 6/12/2018 2:30 PM, Jani Nikula wrote:
> On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel.com> wrote:
>> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>
>> Adds new psrwake options defined in the below table.
>> Platform	PSR wake options vbt version
>> KBL/CFL/WHL	All
>> SKL		All PV releases (Check for 203+ might help but cannot be foolproof)
>> BXT		Uses old interpretation.
>> CNL/ICL+	All
>> GLK		All
>>
>> For SKL, we will continue to use older interpretation for the above reason.
>>
>> Cc: Jani Nikula <jani.nikula@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Puthikorn Voravootivat <puthik@chromium.org>
>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>>
>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>> ---
>>   drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index 465dff4..010ff68 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
>>   	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
>>   	 * Old decimal value is wake up time in multiples of 100 us.
>>   	 */
>> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
>> +	if ((INTEL_GEN(dev_priv) >= 10) ||
>> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {
> Please keep the version check.
Sure. For SKL , shall we use older interpretation for all bdb version as 
vbt team cannot confirm bdb version for SKL?

> Please tell anyone who asks, and also those who don't, that *all* of the
> VBT changes should be based on the *version*, and *none* of them should
> be based on the *platform*.
>
> BR,
> Jani.
>
>>   		switch (psr_table->tp1_wakeup_time) {
>>   		case 0:
>>   			dev_priv->vbt.psr.tp1_wakeup_time_us = 500;

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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Jani Nikula]

On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.com> wrote:
> On 6/12/2018 2:30 PM, Jani Nikula wrote:
>> On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel.com> wrote:
>>> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>>
>>> Adds new psrwake options defined in the below table.
>>> Platform	PSR wake options vbt version
>>> KBL/CFL/WHL	All
>>> SKL		All PV releases (Check for 203+ might help but cannot be foolproof)
>>> BXT		Uses old interpretation.
>>> CNL/ICL+	All
>>> GLK		All
>>>
>>> For SKL, we will continue to use older interpretation for the above reason.
>>>
>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>> Cc: Puthikorn Voravootivat <puthik@chromium.org>
>>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>>>
>>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>>> index 465dff4..010ff68 100644
>>> --- a/drivers/gpu/drm/i915/intel_bios.c
>>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>>> @@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
>>>   	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
>>>   	 * Old decimal value is wake up time in multiples of 100 us.
>>>   	 */
>>> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
>>> +	if ((INTEL_GEN(dev_priv) >= 10) ||
>>> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {
>> Please keep the version check.
> Sure. For SKL , shall we use older interpretation for all bdb version as 
> vbt team cannot confirm bdb version for SKL?

I guess.

BR,
Jani.


>
>> Please tell anyone who asks, and also those who don't, that *all* of the
>> VBT changes should be based on the *version*, and *none* of them should
>> be based on the *platform*.
>>
>> BR,
>> Jani.
>>
>>>   		switch (psr_table->tp1_wakeup_time) {
>>>   		case 0:
>>>   			dev_priv->vbt.psr.tp1_wakeup_time_us = 500;
>

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Ville Syrjälä]

On Tue, Jun 12, 2018 at 10:49:09AM +0530, vathsala nagaraju wrote:
> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> 
> Adds new psrwake options defined in the below table.
> Platform	PSR wake options vbt version
> KBL/CFL/WHL	All
> SKL		All PV releases (Check for 203+ might help but cannot be foolproof)
> BXT		Uses old interpretation.
> CNL/ICL+	All
> GLK		All
> 
> For SKL, we will continue to use older interpretation for the above reason.
> 
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Puthikorn Voravootivat <puthik@chromium.org>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> 
> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 465dff4..010ff68 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
>  	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
>  	 * Old decimal value is wake up time in multiples of 100 us.
>  	 */
> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
> +	if ((INTEL_GEN(dev_priv) >= 10) ||
> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {

That doesn't match your commit message.

>  		switch (psr_table->tp1_wakeup_time) {
>  		case 0:
>  			dev_priv->vbt.psr.tp1_wakeup_time_us = 500;
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Dhinakaran Pandiyan]

On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.co
> m> wrote:
> > 
> > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > 
> > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel.c
> > > om> wrote:
> > > > 
> > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > 
> > > > Adds new psrwake options defined in the below table.
> > > > Platform	PSR wake options vbt version
> > > > KBL/CFL/WHL	All
> > > > SKL		All PV releases (Check for 203+ might help
> > > > but cannot be foolproof)
> > > > BXT		Uses old interpretation.
> > > > CNL/ICL+	All
> > > > GLK		All
> > > > 
> > > > For SKL, we will continue to use older interpretation for the
> > > > above reason.
> > > > 
> > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > 
> > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > ---
> > > >   drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > index 465dff4..010ff68 100644
> > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > @@ -710,7 +710,8 @@ static int intel_bios_ssc_frequency(struct
> > > > drm_i915_private *dev_priv,
> > > >   	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
> > > >   	 * Old decimal value is wake up time in multiples of
> > > > 100 us.
> > > >   	 */
> > > > -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
> > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv))) {
> > > Please keep the version check.
> > Sure. For SKL , shall we use older interpretation for all bdb
> > version as 
> > vbt team cannot confirm bdb version for SKL?
> I guess.
> 

Why not change the version check to >= 203, if that's what PV releases
had as per your commit message? With the current code, Linux and
Windows set 500 us and 2.5 ms respectively on my laptop.



> BR,
> Jani.
> 
> 
> > 
> > 
> > > 
> > > Please tell anyone who asks, and also those who don't, that *all*
> > > of the
> > > VBT changes should be based on the *version*, and *none* of them
> > > should
> > > be based on the *platform*.
> > > 
> > > BR,
> > > Jani.
> > > 
> > > > 
> > > >   		switch (psr_table->tp1_wakeup_time) {
> > > >   		case 0:
> > > >   			dev_priv->vbt.psr.tp1_wakeup_time_us
> > > > = 500;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Dhinakaran Pandiyan]

On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > 
> > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.
> > co
> > m> wrote:
> > > 
> > > 
> > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > 
> > > > 
> > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel
> > > > .c
> > > > om> wrote:
> > > > > 
> > > > > 
> > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > > 
> > > > > Adds new psrwake options defined in the below table.
> > > > > Platform	PSR wake options vbt version
> > > > > KBL/CFL/WHL	All
> > > > > SKL		All PV releases (Check for 203+ might help
> > > > > but cannot be foolproof)
> > > > > BXT		Uses old interpretation.
> > > > > CNL/ICL+	All
> > > > > GLK		All
> > > > > 
> > > > > For SKL, we will continue to use older interpretation for the
> > > > > above reason.
> > > > > 
> > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > > 
> > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com
> > > > > >
> > > > > ---
> > > > >   drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > >   1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > index 465dff4..010ff68 100644
> > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > @@ -710,7 +710,8 @@ static int
> > > > > intel_bios_ssc_frequency(struct
> > > > > drm_i915_private *dev_priv,
> > > > >   	 * New psr options 0=500us, 1=100us, 2=2500us,
> > > > > 3=0us
> > > > >   	 * Old decimal value is wake up time in multiples
> > > > > of
> > > > > 100 us.
> > > > >   	 */
> > > > > -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
> > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv)))
> > > > > {
> > > > Please keep the version check.
> > > Sure. For SKL , shall we use older interpretation for all bdb
> > > version as 
> > > vbt team cannot confirm bdb version for SKL?
> > I guess.
> > 
> Why not change the version check to >= 203, if that's what PV
> releases
> had as per your commit message? With the current code, Linux and
> Windows set 500 us and 2.5 ms respectively on my laptop.
Said laptop is a SKL with bdb version 205.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Nagaraju, Vathsala]

On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
>> On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
>>> On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.
>>> co
>>> m> wrote:
>>>>
>>>> On 6/12/2018 2:30 PM, Jani Nikula wrote:
>>>>>
>>>>> On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel
>>>>> .c
>>>>> om> wrote:
>>>>>>
>>>>>> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>>>>>
>>>>>> Adds new psrwake options defined in the below table.
>>>>>> Platform	PSR wake options vbt version
>>>>>> KBL/CFL/WHL	All
>>>>>> SKL		All PV releases (Check for 203+ might help
>>>>>> but cannot be foolproof)
>>>>>> BXT		Uses old interpretation.
>>>>>> CNL/ICL+	All
>>>>>> GLK		All
>>>>>>
>>>>>> For SKL, we will continue to use older interpretation for the
>>>>>> above reason.
>>>>>>
>>>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>>> Cc: Puthikorn Voravootivat <puthik@chromium.org>
>>>>>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>>>>>>
>>>>>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com
>>>>>> ---
>>>>>>    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>>>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> index 465dff4..010ff68 100644
>>>>>> --- a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> @@ -710,7 +710,8 @@ static int
>>>>>> intel_bios_ssc_frequency(struct
>>>>>> drm_i915_private *dev_priv,
>>>>>>    	 * New psr options 0=500us, 1=100us, 2=2500us,
>>>>>> 3=0us
>>>>>>    	 * Old decimal value is wake up time in multiples
>>>>>> of
>>>>>> 100 us.
>>>>>>    	 */
>>>>>> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
>>>>>> +	if ((INTEL_GEN(dev_priv) >= 10) ||
>>>>>> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv)))
>>>>>> {
>>>>> Please keep the version check.
>>>> Sure. For SKL , shall we use older interpretation for all bdb
>>>> version as
>>>> vbt team cannot confirm bdb version for SKL?
>>> I guess.
>>>
>> Why not change the version check to >= 203, if that's what PV
>> releases
>> had as per your commit message? With the current code, Linux and
>> Windows set 500 us and 2.5 ms respectively on my laptop.
> Said laptop is a SKL with bdb version 205.
+ ashutosh(VBT team)
Since VBT team cannot confirm version for SKL ,so skipped for skylake.
I did a copy paste of the table provided by vbt team, will edit for skylake.


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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Nagaraju, Vathsala]

On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
>> On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
>>> On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.
>>> co
>>> m> wrote:
>>>>
>>>> On 6/12/2018 2:30 PM, Jani Nikula wrote:
>>>>>
>>>>> On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel
>>>>> .c
>>>>> om> wrote:
>>>>>>
>>>>>> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>>>>>
>>>>>> Adds new psrwake options defined in the below table.
>>>>>> Platform	PSR wake options vbt version
>>>>>> KBL/CFL/WHL	All
>>>>>> SKL		All PV releases (Check for 203+ might help
>>>>>> but cannot be foolproof)
>>>>>> BXT		Uses old interpretation.
>>>>>> CNL/ICL+	All
>>>>>> GLK		All
>>>>>>
>>>>>> For SKL, we will continue to use older interpretation for the
>>>>>> above reason.
>>>>>>
>>>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>>> Cc: Puthikorn Voravootivat <puthik@chromium.org>
>>>>>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>>>>>>
>>>>>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com
>>>>>> ---
>>>>>>    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>>>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> index 465dff4..010ff68 100644
>>>>>> --- a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> @@ -710,7 +710,8 @@ static int
>>>>>> intel_bios_ssc_frequency(struct
>>>>>> drm_i915_private *dev_priv,
>>>>>>    	 * New psr options 0=500us, 1=100us, 2=2500us,
>>>>>> 3=0us
>>>>>>    	 * Old decimal value is wake up time in multiples
>>>>>> of
>>>>>> 100 us.
>>>>>>    	 */
>>>>>> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
>>>>>> +	if ((INTEL_GEN(dev_priv) >= 10) ||
>>>>>> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv)))
>>>>>> {
>>>>> Please keep the version check.
>>>> Sure. For SKL , shall we use older interpretation for all bdb
>>>> version as
>>>> vbt team cannot confirm bdb version for SKL?
>>> I guess.
>>>
>> Why not change the version check to >= 203, if that's what PV
>> releases
>> had as per your commit message? With the current code, Linux and
>> Windows set 500 us and 2.5 ms respectively on my laptop.
> Said laptop is a SKL with bdb version 205.
+ ashutosh(VBT team)
Since VBT team cannot confirm version for SKL ,so skipped for skylake.
I did a copy paste of the table provided by vbt team, will edit for skylake

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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Nagaraju, Vathsala]

On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
>> On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
>>> On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@intel.
>>> co
>>> m> wrote:
>>>>
>>>> On 6/12/2018 2:30 PM, Jani Nikula wrote:
>>>>>
>>>>> On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@intel
>>>>> .c
>>>>> om> wrote:
>>>>>>
>>>>>> From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>>>>>>
>>>>>> Adds new psrwake options defined in the below table.
>>>>>> Platform	PSR wake options vbt version
>>>>>> KBL/CFL/WHL	All
>>>>>> SKL		All PV releases (Check for 203+ might help
>>>>>> but cannot be foolproof)
>>>>>> BXT		Uses old interpretation.
>>>>>> CNL/ICL+	All
>>>>>> GLK		All
>>>>>>
>>>>>> For SKL, we will continue to use older interpretation for the
>>>>>> above reason.
>>>>>>
>>>>>> Cc: Jani Nikula <jani.nikula@intel.com>
>>>>>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>>>>>> Cc: Puthikorn Voravootivat <puthik@chromium.org>
>>>>>> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>>>>>>
>>>>>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel.com
>>>>>> ---
>>>>>>    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>>>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> index 465dff4..010ff68 100644
>>>>>> --- a/drivers/gpu/drm/i915/intel_bios.c
>>>>>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>>>>>> @@ -710,7 +710,8 @@ static int
>>>>>> intel_bios_ssc_frequency(struct
>>>>>> drm_i915_private *dev_priv,
>>>>>>    	 * New psr options 0=500us, 1=100us, 2=2500us,
>>>>>> 3=0us
>>>>>>    	 * Old decimal value is wake up time in multiples
>>>>>> of
>>>>>> 100 us.
>>>>>>    	 */
>>>>>> -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv)) {
>>>>>> +	if ((INTEL_GEN(dev_priv) >= 10) ||
>>>>>> +	    (IS_GEN9_BC(dev_priv) && !IS_SKYLAKE(dev_priv)))
>>>>>> {
>>>>> Please keep the version check.
>>>> Sure. For SKL , shall we use older interpretation for all bdb
>>>> version as
>>>> vbt team cannot confirm bdb version for SKL?
>>> I guess.
>>>
>> Why not change the version check to >= 203, if that's what PV
>> releases
>> had as per your commit message? With the current code, Linux and
>> Windows set 500 us and 2.5 ms respectively on my laptop.
> Said laptop is a SKL with bdb version 205.
I did a copy paste of the table provided by vbt team, will edit for skylake
Since VBT team cannot confirm version for SKL ,so skipping for skylake.

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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Pandiyan, Dhinakaran]

On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
> 
> On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> > 
> > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> > > 
> > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > > > 
> > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@in
> > > > tel.
> > > > co
> > > > m> wrote:
> > > > > 
> > > > > 
> > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > > > 
> > > > > > 
> > > > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@i
> > > > > > ntel
> > > > > > .c
> > > > > > om> wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > > > > 
> > > > > > > Adds new psrwake options defined in the below table.
> > > > > > > Platform	PSR wake options vbt version
> > > > > > > KBL/CFL/WHL	All
> > > > > > > SKL		All PV releases (Check for 203+ might
> > > > > > > help
> > > > > > > but cannot be foolproof)
> > > > > > > BXT		Uses old interpretation.
> > > > > > > CNL/ICL+	All
> > > > > > > GLK		All
> > > > > > > 
> > > > > > > For SKL, we will continue to use older interpretation for
> > > > > > > the
> > > > > > > above reason.
> > > > > > > 
> > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > > > > 
> > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel
> > > > > > > .com
> > > > > > > ---
> > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > > > 
> > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > index 465dff4..010ff68 100644
> > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > @@ -710,7 +710,8 @@ static int
> > > > > > > intel_bios_ssc_frequency(struct
> > > > > > > drm_i915_private *dev_priv,
> > > > > > >    	 * New psr options 0=500us, 1=100us, 2=2500us,
> > > > > > > 3=0us
> > > > > > >    	 * Old decimal value is wake up time in
> > > > > > > multiples
> > > > > > > of
> > > > > > > 100 us.
> > > > > > >    	 */
> > > > > > > -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv))
> > > > > > > {
> > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
> > > > > > > !IS_SKYLAKE(dev_priv)))
> > > > > > > {
> > > > > > Please keep the version check.
> > > > > Sure. For SKL , shall we use older interpretation for all bdb
> > > > > version as
> > > > > vbt team cannot confirm bdb version for SKL?
> > > > I guess.
> > > > 
> > > Why not change the version check to >= 203, if that's what PV
> > > releases
> > > had as per your commit message? With the current code, Linux and
> > > Windows set 500 us and 2.5 ms respectively on my laptop.
> > Said laptop is a SKL with bdb version 205.
> + ashutosh(VBT team)
> Since VBT team cannot confirm version for SKL ,so skipped for
> skylake.
> I did a copy paste of the table provided by vbt team, will edit for
> skylake.
> 
We are not going to get this right for all combinations, the best we
can do is make sure things work in most cases. I prefer to err on the
side of using the new mapping because when translated incorrectly, 3
out of 4 values lead to >= intended training time. Given the fact that
SKL PV releases also used the new mapping, I suggest you do this

if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
/* new mapping */

}

I don't know what the basis for the current check for version 209 is,
other than it was the version on the KBL you tested.

-DK





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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Rodrigo Vivi]

On Thu, Jun 14, 2018 at 09:00:15AM -0700, Pandiyan, Dhinakaran wrote:
> On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
> > 
> > On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> > > 
> > > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> > > > 
> > > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > > > > 
> > > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@in
> > > > > tel.
> > > > > co
> > > > > m> wrote:
> > > > > > 
> > > > > > 
> > > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@i
> > > > > > > ntel
> > > > > > > .c
> > > > > > > om> wrote:
> > > > > > > > 
> > > > > > > > 
> > > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > > > > > 
> > > > > > > > Adds new psrwake options defined in the below table.
> > > > > > > > Platform	PSR wake options vbt version
> > > > > > > > KBL/CFL/WHL	All
> > > > > > > > SKL		All PV releases (Check for 203+ might
> > > > > > > > help
> > > > > > > > but cannot be foolproof)
> > > > > > > > BXT		Uses old interpretation.
> > > > > > > > CNL/ICL+	All
> > > > > > > > GLK		All
> > > > > > > > 
> > > > > > > > For SKL, we will continue to use older interpretation for
> > > > > > > > the
> > > > > > > > above reason.
> > > > > > > > 
> > > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > > > > > 
> > > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel
> > > > > > > > .com
> > > > > > > > ---
> > > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > > > > 
> > > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > index 465dff4..010ff68 100644
> > > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > @@ -710,7 +710,8 @@ static int
> > > > > > > > intel_bios_ssc_frequency(struct
> > > > > > > > drm_i915_private *dev_priv,
> > > > > > > >    	 * New psr options 0=500us, 1=100us, 2=2500us,
> > > > > > > > 3=0us
> > > > > > > >    	 * Old decimal value is wake up time in
> > > > > > > > multiples
> > > > > > > > of
> > > > > > > > 100 us.
> > > > > > > >    	 */
> > > > > > > > -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv))
> > > > > > > > {
> > > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
> > > > > > > > !IS_SKYLAKE(dev_priv)))
> > > > > > > > {
> > > > > > > Please keep the version check.
> > > > > > Sure. For SKL , shall we use older interpretation for all bdb
> > > > > > version as
> > > > > > vbt team cannot confirm bdb version for SKL?
> > > > > I guess.
> > > > > 
> > > > Why not change the version check to >= 203, if that's what PV
> > > > releases
> > > > had as per your commit message? With the current code, Linux and
> > > > Windows set 500 us and 2.5 ms respectively on my laptop.
> > > Said laptop is a SKL with bdb version 205.
> > + ashutosh(VBT team)
> > Since VBT team cannot confirm version for SKL ,so skipped for
> > skylake.
> > I did a copy paste of the table provided by vbt team, will edit for
> > skylake.
> > 
> We are not going to get this right for all combinations,

:(
it seems we have to live with it

> the best we
> can do is make sure things work in most cases.

I agree.

> I prefer to err on the
> side of using the new mapping because when translated incorrectly, 3
> out of 4 values lead to >= intended training time. Given the fact that
> SKL PV releases also used the new mapping, I suggest you do this
> 
> if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
> IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {

+1

> /* new mapping */
> 
> }
> 
> I don't know what the basis for the current check for version 209 is,
> other than it was the version on the KBL you tested.
> 
> -DK
> 
> 
> 
> 
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Nagaraju, Vathsala]

+ Ashutosh(VBT team)   + maulik

209 is confirmed version on kbl both by vbt team (Maulik) and google, so we had used it.

DK's suggestion is 
if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
/* new mapping */

As per Ashutosh, 203 Is not the right version, 205 is fine , but user can still provide decimal value for SKL.
Jani/Rodrigo, should we use 205 for SKL or  drop SKL from the new mapping?

-----Original Message-----
From: Pandiyan, Dhinakaran 
Sent: Thursday, June 14, 2018 9:30 PM
To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Nikula, Jani <jani.nikula@intel.com>; Nagaraju, Vathsala <vathsala.nagaraju@intel.com>
Cc: puthik@chromium.org; intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
> 
> On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> > 
> > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> > > 
> > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > > > 
> > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@in 
> > > > tel.
> > > > co
> > > > m> wrote:
> > > > > 
> > > > > 
> > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > > > 
> > > > > > 
> > > > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju@i 
> > > > > > ntel .c
> > > > > > om> wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > > > > 
> > > > > > > Adds new psrwake options defined in the below table.
> > > > > > > Platform	PSR wake options vbt version
> > > > > > > KBL/CFL/WHL	All
> > > > > > > SKL		All PV releases (Check for 203+ might
> > > > > > > help
> > > > > > > but cannot be foolproof)
> > > > > > > BXT		Uses old interpretation.
> > > > > > > CNL/ICL+	All
> > > > > > > GLK		All
> > > > > > > 
> > > > > > > For SKL, we will continue to use older interpretation for 
> > > > > > > the above reason.
> > > > > > > 
> > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > > > > 
> > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@intel 
> > > > > > > .com
> > > > > > > ---
> > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > > > 
> > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > index 465dff4..010ff68 100644
> > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > @@ -710,7 +710,8 @@ static int 
> > > > > > > intel_bios_ssc_frequency(struct drm_i915_private 
> > > > > > > *dev_priv,
> > > > > > >    	 * New psr options 0=500us, 1=100us, 2=2500us, 3=0us
> > > > > > >    	 * Old decimal value is wake up time in multiples of
> > > > > > > 100 us.
> > > > > > >    	 */
> > > > > > > -	if (bdb->version >= 209 && IS_GEN9_BC(dev_priv))
> > > > > > > {
> > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
> > > > > > > !IS_SKYLAKE(dev_priv)))
> > > > > > > {
> > > > > > Please keep the version check.
> > > > > Sure. For SKL , shall we use older interpretation for all bdb 
> > > > > version as vbt team cannot confirm bdb version for SKL?
> > > > I guess.
> > > > 
> > > Why not change the version check to >= 203, if that's what PV
> > > releases
> > > had as per your commit message? With the current code, Linux and
> > > Windows set 500 us and 2.5 ms respectively on my laptop.
> > Said laptop is a SKL with bdb version 205.
> + ashutosh(VBT team)
> Since VBT team cannot confirm version for SKL ,so skipped for
> skylake.
> I did a copy paste of the table provided by vbt team, will edit for
> skylake.
> 
We are not going to get this right for all combinations, the best we
can do is make sure things work in most cases. I prefer to err on the
side of using the new mapping because when translated incorrectly, 3
out of 4 values lead to >= intended training time. Given the fact that
SKL PV releases also used the new mapping, I suggest you do this

if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
/* new mapping */

}

I don't know what the basis for the current check for version 209 is,
other than it was the version on the KBL you tested.

-DK





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

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Dhinakaran Pandiyan]

On Thu, 2018-06-14 at 16:56 +0000, Nagaraju, Vathsala wrote:
> + Ashutosh(VBT team)   + maulik
> 
> 209 is confirmed version on kbl both by vbt team (Maulik) and google,
> so we had used it.
> 
> DK's suggestion is 
> if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
> IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
> /* new mapping */
> 
> As per Ashutosh, 203 Is not the right version, 205 is fine , but user
> can still provide decimal value for SKL.
 
I am confused, why does the commit message mention 203 then?


> Jani/Rodrigo, should we use 205 for SKL or  drop SKL from the new
> mapping?
> 
> -----Original Message-----
> From: Pandiyan, Dhinakaran 
> Sent: Thursday, June 14, 2018 9:30 PM
> To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Nikula, Jani <jani.nikula
> @intel.com>; Nagaraju, Vathsala <vathsala.nagaraju@intel.com>
> Cc: puthik@chromium.org; intel-gfx@lists.freedesktop.org
> Subject: Re: [PATCH] drm/i915/psr: Adds psrwake options for all
> platforms
> 
> On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
> > 
> > 
> > On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> > > 
> > > 
> > > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> > > > 
> > > > 
> > > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > > > > 
> > > > > 
> > > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@
> > > > > in 
> > > > > tel.
> > > > > co
> > > > > m> wrote:
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju
> > > > > > > @i 
> > > > > > > ntel .c
> > > > > > > om> wrote:
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
> > > > > > > > 
> > > > > > > > Adds new psrwake options defined in the below table.
> > > > > > > > Platform	PSR wake options vbt version
> > > > > > > > KBL/CFL/WHL	All
> > > > > > > > SKL		All PV releases (Check for 203+
> > > > > > > > might
> > > > > > > > help
> > > > > > > > but cannot be foolproof)
> > > > > > > > BXT		Uses old interpretation.
> > > > > > > > CNL/ICL+	All
> > > > > > > > GLK		All
> > > > > > > > 
> > > > > > > > For SKL, we will continue to use older interpretation
> > > > > > > > for 
> > > > > > > > the above reason.
> > > > > > > > 
> > > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> > > > > > > > 
> > > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@int
> > > > > > > > el 
> > > > > > > > .com
> > > > > > > > ---
> > > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > > > > 
> > > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > index 465dff4..010ff68 100644
> > > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > @@ -710,7 +710,8 @@ static int 
> > > > > > > > intel_bios_ssc_frequency(struct drm_i915_private 
> > > > > > > > *dev_priv,
> > > > > > > >    	 * New psr options 0=500us, 1=100us,
> > > > > > > > 2=2500us, 3=0us
> > > > > > > >    	 * Old decimal value is wake up time in
> > > > > > > > multiples of
> > > > > > > > 100 us.
> > > > > > > >    	 */
> > > > > > > > -	if (bdb->version >= 209 &&
> > > > > > > > IS_GEN9_BC(dev_priv))
> > > > > > > > {
> > > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
> > > > > > > > !IS_SKYLAKE(dev_priv)))
> > > > > > > > {
> > > > > > > Please keep the version check.
> > > > > > Sure. For SKL , shall we use older interpretation for all
> > > > > > bdb 
> > > > > > version as vbt team cannot confirm bdb version for SKL?
> > > > > I guess.
> > > > > 
> > > > Why not change the version check to >= 203, if that's what PV
> > > > releases
> > > > had as per your commit message? With the current code, Linux
> > > > and
> > > > Windows set 500 us and 2.5 ms respectively on my laptop.
> > > Said laptop is a SKL with bdb version 205.
> > + ashutosh(VBT team)
> > Since VBT team cannot confirm version for SKL ,so skipped for
> > skylake.
> > I did a copy paste of the table provided by vbt team, will edit for
> > skylake.
> > 
> We are not going to get this right for all combinations, the best we
> can do is make sure things work in most cases. I prefer to err on the
> side of using the new mapping because when translated incorrectly, 3
> out of 4 values lead to >= intended training time. Given the fact
> that
> SKL PV releases also used the new mapping, I suggest you do this
> 
> if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
> IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
> /* new mapping */
> 
> }
> 
> I don't know what the basis for the current check for version 209 is,
> other than it was the version on the KBL you tested.
> 
> -DK
> 
> 
> 
> 
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Jani Nikula]

On Thu, 14 Jun 2018, Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> wrote:
> On Thu, 2018-06-14 at 16:56 +0000, Nagaraju, Vathsala wrote:
>> + Ashutosh(VBT team)   + maulik
>> 
>> 209 is confirmed version on kbl both by vbt team (Maulik) and google,
>> so we had used it.
>> 
>> DK's suggestion is 
>> if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
>> IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
>> /* new mapping */
>> 
>> As per Ashutosh, 203 Is not the right version, 205 is fine , but user
>> can still provide decimal value for SKL.
>  
> I am confused, why does the commit message mention 203 then?

Whatever the version, I want that to be required always. i.e.

	if (version >= N && (bunch of other conditions))

*not*

	if (version >= N || (bunch of other conditions))

BR,
Jani.

>
>
>> Jani/Rodrigo, should we use 205 for SKL or  drop SKL from the new
>> mapping?
>> 
>> -----Original Message-----
>> From: Pandiyan, Dhinakaran 
>> Sent: Thursday, June 14, 2018 9:30 PM
>> To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Nikula, Jani <jani.nikula
>> @intel.com>; Nagaraju, Vathsala <vathsala.nagaraju@intel.com>
>> Cc: puthik@chromium.org; intel-gfx@lists.freedesktop.org
>> Subject: Re: [PATCH] drm/i915/psr: Adds psrwake options for all
>> platforms
>> 
>> On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
>> > 
>> > 
>> > On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
>> > > 
>> > > 
>> > > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
>> > > > 
>> > > > 
>> > > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
>> > > > > 
>> > > > > 
>> > > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala" <vathsala.nagaraju@
>> > > > > in 
>> > > > > tel.
>> > > > > co
>> > > > > m> wrote:
>> > > > > > 
>> > > > > > 
>> > > > > > 
>> > > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
>> > > > > > > 
>> > > > > > > 
>> > > > > > > 
>> > > > > > > On Tue, 12 Jun 2018, vathsala nagaraju <vathsala.nagaraju
>> > > > > > > @i 
>> > > > > > > ntel .c
>> > > > > > > om> wrote:
>> > > > > > > > 
>> > > > > > > > 
>> > > > > > > > 
>> > > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.com>
>> > > > > > > > 
>> > > > > > > > Adds new psrwake options defined in the below table.
>> > > > > > > > Platform	PSR wake options vbt version
>> > > > > > > > KBL/CFL/WHL	All
>> > > > > > > > SKL		All PV releases (Check for 203+
>> > > > > > > > might
>> > > > > > > > help
>> > > > > > > > but cannot be foolproof)
>> > > > > > > > BXT		Uses old interpretation.
>> > > > > > > > CNL/ICL+	All
>> > > > > > > > GLK		All
>> > > > > > > > 
>> > > > > > > > For SKL, we will continue to use older interpretation
>> > > > > > > > for 
>> > > > > > > > the above reason.
>> > > > > > > > 
>> > > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
>> > > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> > > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
>> > > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
>> > > > > > > > 
>> > > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@int
>> > > > > > > > el 
>> > > > > > > > .com
>> > > > > > > > ---
>> > > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
>> > > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
>> > > > > > > > 
>> > > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
>> > > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
>> > > > > > > > index 465dff4..010ff68 100644
>> > > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
>> > > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
>> > > > > > > > @@ -710,7 +710,8 @@ static int 
>> > > > > > > > intel_bios_ssc_frequency(struct drm_i915_private 
>> > > > > > > > *dev_priv,
>> > > > > > > >    	 * New psr options 0=500us, 1=100us,
>> > > > > > > > 2=2500us, 3=0us
>> > > > > > > >    	 * Old decimal value is wake up time in
>> > > > > > > > multiples of
>> > > > > > > > 100 us.
>> > > > > > > >    	 */
>> > > > > > > > -	if (bdb->version >= 209 &&
>> > > > > > > > IS_GEN9_BC(dev_priv))
>> > > > > > > > {
>> > > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
>> > > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
>> > > > > > > > !IS_SKYLAKE(dev_priv)))
>> > > > > > > > {
>> > > > > > > Please keep the version check.
>> > > > > > Sure. For SKL , shall we use older interpretation for all
>> > > > > > bdb 
>> > > > > > version as vbt team cannot confirm bdb version for SKL?
>> > > > > I guess.
>> > > > > 
>> > > > Why not change the version check to >= 203, if that's what PV
>> > > > releases
>> > > > had as per your commit message? With the current code, Linux
>> > > > and
>> > > > Windows set 500 us and 2.5 ms respectively on my laptop.
>> > > Said laptop is a SKL with bdb version 205.
>> > + ashutosh(VBT team)
>> > Since VBT team cannot confirm version for SKL ,so skipped for
>> > skylake.
>> > I did a copy paste of the table provided by vbt team, will edit for
>> > skylake.
>> > 
>> We are not going to get this right for all combinations, the best we
>> can do is make sure things work in most cases. I prefer to err on the
>> side of using the new mapping because when translated incorrectly, 3
>> out of 4 values lead to >= intended training time. Given the fact
>> that
>> SKL PV releases also used the new mapping, I suggest you do this
>> 
>> if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
>> IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
>> /* new mapping */
>> 
>> }
>> 
>> I don't know what the basis for the current check for version 209 is,
>> other than it was the version on the KBL you tested.
>> 
>> -DK
>> 
>> 
>> 
>> 
>> 

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/psr: Adds psrwake options for all platforms

[Dhinakaran Pandiyan]

On Fri, 2018-06-15 at 11:10 +0300, Jani Nikula wrote:
> On Thu, 14 Jun 2018, Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.c
> om> wrote:
> > 
> > On Thu, 2018-06-14 at 16:56 +0000, Nagaraju, Vathsala wrote:
> > > 
> > > + Ashutosh(VBT team)   + maulik
> > > 
> > > 209 is confirmed version on kbl both by vbt team (Maulik) and
> > > google,
> > > so we had used it.
> > > 
> > > DK's suggestion is 
> > > if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
> > > IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
> > > /* new mapping */
> > > 
> > > As per Ashutosh, 203 Is not the right version, 205 is fine , but
> > > user
> > > can still provide decimal value for SKL.
> >  
> > I am confused, why does the commit message mention 203 then?
> Whatever the version, I want that to be required always. i.e.
> 
> 	if (version >= N && (bunch of other conditions))

Using the version number as a guard makes sense but this means we need
a version number that's applicable to all platforms.

Vathsala,
Can you please confirm if all platforms that you want to use the new
mapping for have version numbers >= 205?

If that's the case, it should be easy to change the check to

if (version >= 205 && (IS_GEN9_BC() || IS_GEMINILAKE() || INTEL_GEN()
>= 10))


> 
> *not*
> 
> 	if (version >= N || (bunch of other conditions))
> 
> BR,
> Jani.
> 
> > 
> > 
> > 
> > > 
> > > Jani/Rodrigo, should we use 205 for SKL or  drop SKL from the new
> > > mapping?
> > > 
> > > -----Original Message-----
> > > From: Pandiyan, Dhinakaran 
> > > Sent: Thursday, June 14, 2018 9:30 PM
> > > To: Vivi, Rodrigo <rodrigo.vivi@intel.com>; Nikula, Jani
> > > <jani.nikula
> > > @intel.com>; Nagaraju, Vathsala <vathsala.nagaraju@intel.com>
> > > Cc: puthik@chromium.org; intel-gfx@lists.freedesktop.org
> > > Subject: Re: [PATCH] drm/i915/psr: Adds psrwake options for all
> > > platforms
> > > 
> > > On Thu, 2018-06-14 at 11:59 +0530, Nagaraju, Vathsala wrote:
> > > > 
> > > > 
> > > > 
> > > > On 6/13/2018 11:10 PM, Dhinakaran Pandiyan wrote:
> > > > > 
> > > > > 
> > > > > 
> > > > > On Wed, 2018-06-13 at 10:32 -0700, Dhinakaran Pandiyan wrote:
> > > > > > 
> > > > > > 
> > > > > > 
> > > > > > On Wed, 2018-06-13 at 09:41 +0300, Jani Nikula wrote:
> > > > > > > 
> > > > > > > 
> > > > > > > 
> > > > > > > On Wed, 13 Jun 2018, "Nagaraju, Vathsala"
> > > > > > > <vathsala.nagaraju@
> > > > > > > in 
> > > > > > > tel.
> > > > > > > co
> > > > > > > m> wrote:
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > > > > > 
> > > > > > > > On 6/12/2018 2:30 PM, Jani Nikula wrote:
> > > > > > > > > 
> > > > > > > > > 
> > > > > > > > > 
> > > > > > > > > 
> > > > > > > > > On Tue, 12 Jun 2018, vathsala nagaraju
> > > > > > > > > <vathsala.nagaraju
> > > > > > > > > @i 
> > > > > > > > > ntel .c
> > > > > > > > > om> wrote:
> > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > 
> > > > > > > > > > From: Vathsala Nagaraju <vathsala.nagaraju@intel.co
> > > > > > > > > > m>
> > > > > > > > > > 
> > > > > > > > > > Adds new psrwake options defined in the below
> > > > > > > > > > table.
> > > > > > > > > > Platform	PSR wake options vbt version
> > > > > > > > > > KBL/CFL/WHL	All
> > > > > > > > > > SKL		All PV releases (Check for 203+
> > > > > > > > > > might
> > > > > > > > > > help
> > > > > > > > > > but cannot be foolproof)
> > > > > > > > > > BXT		Uses old interpretation.
> > > > > > > > > > CNL/ICL+	All
> > > > > > > > > > GLK		All
> > > > > > > > > > 
> > > > > > > > > > For SKL, we will continue to use older
> > > > > > > > > > interpretation
> > > > > > > > > > for 
> > > > > > > > > > the above reason.
> > > > > > > > > > 
> > > > > > > > > > Cc: Jani Nikula <jani.nikula@intel.com>
> > > > > > > > > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > > > > > > > > > Cc: Puthikorn Voravootivat <puthik@chromium.org>
> > > > > > > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.
> > > > > > > > > > com>
> > > > > > > > > > 
> > > > > > > > > > Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju
> > > > > > > > > > @int
> > > > > > > > > > el 
> > > > > > > > > > .com
> > > > > > > > > > ---
> > > > > > > > > >    drivers/gpu/drm/i915/intel_bios.c | 3 ++-
> > > > > > > > > >    1 file changed, 2 insertions(+), 1 deletion(-)
> > > > > > > > > > 
> > > > > > > > > > diff --git a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > > > b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > > > index 465dff4..010ff68 100644
> > > > > > > > > > --- a/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > > > +++ b/drivers/gpu/drm/i915/intel_bios.c
> > > > > > > > > > @@ -710,7 +710,8 @@ static int 
> > > > > > > > > > intel_bios_ssc_frequency(struct drm_i915_private 
> > > > > > > > > > *dev_priv,
> > > > > > > > > >    	 * New psr options 0=500us, 1=100us,
> > > > > > > > > > 2=2500us, 3=0us
> > > > > > > > > >    	 * Old decimal value is wake up time in
> > > > > > > > > > multiples of
> > > > > > > > > > 100 us.
> > > > > > > > > >    	 */
> > > > > > > > > > -	if (bdb->version >= 209 &&
> > > > > > > > > > IS_GEN9_BC(dev_priv))
> > > > > > > > > > {
> > > > > > > > > > +	if ((INTEL_GEN(dev_priv) >= 10) ||
> > > > > > > > > > +	    (IS_GEN9_BC(dev_priv) &&
> > > > > > > > > > !IS_SKYLAKE(dev_priv)))
> > > > > > > > > > {
> > > > > > > > > Please keep the version check.
> > > > > > > > Sure. For SKL , shall we use older interpretation for
> > > > > > > > all
> > > > > > > > bdb 
> > > > > > > > version as vbt team cannot confirm bdb version for SKL?
> > > > > > > I guess.
> > > > > > > 
> > > > > > Why not change the version check to >= 203, if that's what
> > > > > > PV
> > > > > > releases
> > > > > > had as per your commit message? With the current code,
> > > > > > Linux
> > > > > > and
> > > > > > Windows set 500 us and 2.5 ms respectively on my laptop.
> > > > > Said laptop is a SKL with bdb version 205.
> > > > + ashutosh(VBT team)
> > > > Since VBT team cannot confirm version for SKL ,so skipped for
> > > > skylake.
> > > > I did a copy paste of the table provided by vbt team, will edit
> > > > for
> > > > skylake.
> > > > 
> > > We are not going to get this right for all combinations, the best
> > > we
> > > can do is make sure things work in most cases. I prefer to err on
> > > the
> > > side of using the new mapping because when translated
> > > incorrectly, 3
> > > out of 4 values lead to >= intended training time. Given the fact
> > > that
> > > SKL PV releases also used the new mapping, I suggest you do this
> > > 
> > > if ((bdb->version >= 203 && IS_GEN9_BC(dev_priv)) ||
> > > IS_GEMINILAKE(dev_priv) ||  INTEL_GEN(dev_priv) >= 10) {
> > > /* new mapping */
> > > 
> > > }
> > > 
> > > I don't know what the basis for the current check for version 209
> > > is,
> > > other than it was the version on the KBL you tested.
> > > 
> > > -DK
> > > 
> > > 
> > > 
> > > 
> > > 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx