drm/i915/psr: vbt change for psr
Subsystems (2)
PATCH 1/1 drm/i915/psr: vbt change for psr
From: Vathsala Nagaraju <[email protected]>
For psr block #9, the vbt description has moved to options [0-3] for TP1,TP2,TP3 Wakeup time from decimal value without any change to vbt structure. Since spec does not mention from which VBT version this change was added to vbt.bsf file, we cannot depend on bdb->version check to change for all the platforms.
There is RCR inplace for GOP team to provide the version number to make generic change. Since Kabylake with bdb version 209 is having this change, limiting this change to kbl and version 209+ to unblock google.
bspec 20131
v2: (Jani and Rodrigo)
move the 165 version check to intel_bios.c
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_bios.c | 3 ++ drivers/gpu/drm/i915/intel_psr.c | 84 ++++++++++++++++++++++++++------------- 3 files changed, 61 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1075,6 +1075,7 @@ struct intel_vbt_data {enum psr_lines_to_wait lines_to_wait;int tp1_wakeup_time;int tp2_tp3_wakeup_time; +int is_tp_time_options; } psr;struct {
drivers/gpu/drm/i915/intel_bios.c +3 -0
@@ -659,6 +659,9 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,return ; } +if (bdb->version >=209 &&IS_KABYLAKE (dev_priv)) + dev_priv->vbt.psr.is_tp_time_options = true; + psr_table = &psr->psr_table[panel_type]; dev_priv->vbt.psr.full_link = psr_table->full_link;
drivers/gpu/drm/i915/intel_psr.c +57 -27
97 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: vbt change for psr (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/psr: vbt change for psr (rev2)
URL : https://patchwork.freedesktop.org/series/41289/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4047 -> Patchwork_8671 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8671/
== Changes ==
No changes found
== Participating hosts (35 -> 32) ==
Missing (3): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4047 -> Patchwork_8671
CI_DRM_4047: b21f4ebec3a255026a780ee4a35ec5f8d9ede6cd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4423: d502f055ac4500cada758876a512ac4f14b34851 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8671: fd6549ccf3e4df28c95a9fe9b5346923dea75d56 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4423: 45e115f293fd6acc0c9647cf2d3b76be78819ba5 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
fd6549ccf3e4 drm/i915/psr: vbt change for psr
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8671/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/psr: vbt change for psr (rev2)
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: drm/i915/psr: vbt change for psr (rev2)
URL : https://patchwork.freedesktop.org/series/41289/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4047_full -> Patchwork_8671_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8671_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8671_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8671/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8671_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-blt:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_8671_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_gtt:
shard-apl: PASS -> INCOMPLETE (fdo#103927)
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-hsw: PASS -> INCOMPLETE (fdo#103540)
igt@kms_ccs@pipe-b-missing-ccs-buffer:
shard-kbl: PASS -> DMESG-WARN (fdo#103558) +16
igt@kms_draw_crc@draw-method-rgb565-mmap-wc-ytiled:
shard-kbl: PASS -> DMESG-FAIL (fdo#103558)
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-hsw: PASS -> FAIL (fdo#102887)
igt@kms_flip@2x-plain-flip-ts-check:
shard-hsw: PASS -> FAIL (fdo#100368)
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-hsw: PASS -> FAIL (fdo#103928)
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
shard-hsw: PASS -> FAIL (fdo#103481)
==== Possible fixes ====
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-hsw: FAIL (fdo#100368) -> PASS
igt@perf_pmu@rc6-runtime-pm-long:
shard-kbl: FAIL (fdo#105010) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#105010 https://bugs.freedesktop.org/show_bug.cgi?id=105010
== Participating hosts (6 -> 4) ==
Missing (2): shard-glk shard-glkb
== Build changes ==
* Linux: CI_DRM_4047 -> Patchwork_8671
CI_DRM_4047: b21f4ebec3a255026a780ee4a35ec5f8d9ede6cd @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4423: d502f055ac4500cada758876a512ac4f14b34851 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8671: fd6549ccf3e4df28c95a9fe9b5346923dea75d56 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4423: 45e115f293fd6acc0c9647cf2d3b76be78819ba5 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8671/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 11 lines · vathsala nagaraju
From: Vathsala Nagaraju <[email protected]>
For psr block #9, the vbt description has moved to options [0-3] for TP1,TP2,TP3 Wakeup time from decimal value without any change to vbt structure. Since spec does not mention from which VBT version this change was added to vbt.bsf file, we cannot depend on
bdb->versioncheck to change for all the platforms.There is RCR inplace for GOP team to provide the version number to make generic change. Since Kabylake with bdb version 209 is having this change, limiting this change to kbl and version 209+ to unblock google.
The point was to move the whole abstraction to intel_bios.c, not just the version check. To not need any is_tp_time_options field.
I think making platform based restrictions on the vbt fields unless explicitly specified in the vbt bspec is the wrong thing to do.
BR,
Jani.
Quoted 145 lines
bspec 20131
v2: (Jani and Rodrigo)
move the 165 version check tointel_bios.cCc Rodrigo Vivi <[email protected]>CC Puthikorn Voravootivat <[email protected]>Signed-off-by Maulik V Vaghela <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_bios.c | 3 ++ drivers/gpu/drm/i915/intel_psr.c | 84 ++++++++++++++++++++++++++------------- 3 files changed, 61 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1075,6 +1075,7 @@ struct intel_vbt_data {enum psr_lines_to_wait lines_to_wait;int tp1_wakeup_time;int tp2_tp3_wakeup_time; +int is_tp_time_options; } psr;struct {drivers/gpu/drm/i915/intel_bios.c +3
-0@@ -659,6 +659,9 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,return ; } +if (bdb->version >=209 &&IS_KABYLAKE (dev_priv)) + dev_priv->vbt.psr.is_tp_time_options = true; + psr_table = &psr->psr_table[panel_type]; dev_priv->vbt.psr.full_link = psr_table->full_link;drivers/gpu/drm/i915/intel_psr.c +57
-27@@ -353,24 +353,45 @@ static void hsw_activate_psr1(struct intel_dp *intel_dp)if (dev_priv->psr.link_standby) val |=EDP_PSR_LINK_STANDBY ; -if (dev_priv->vbt.psr.tp1_wakeup_time >5 ) - val |= EDP_PSR_TP1_TIME_2500us; -else if (dev_priv->vbt.psr.tp1_wakeup_time >1 ) - val |= EDP_PSR_TP1_TIME_500us; -else if (dev_priv->vbt.psr.tp1_wakeup_time >0 ) - val |= EDP_PSR_TP1_TIME_100us; -else - val |= EDP_PSR_TP1_TIME_0us; - -if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) - val |= EDP_PSR_TP2_TP3_TIME_2500us; -else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >1 ) - val |= EDP_PSR_TP2_TP3_TIME_500us; -else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >0 ) - val |= EDP_PSR_TP2_TP3_TIME_100us; -else - val |= EDP_PSR_TP2_TP3_TIME_0us; +if (dev_priv->vbt.psr.is_tp_time_options) { +if (dev_priv->vbt.psr.tp1_wakeup_time ==0 ) + val |= EDP_PSR_TP1_TIME_500us; +else if (dev_priv->vbt.psr.tp1_wakeup_time ==1 ) + val |= EDP_PSR_TP1_TIME_100us; +else if (dev_priv->vbt.psr.tp1_wakeup_time ==2 ) + val |= EDP_PSR_TP1_TIME_2500us; +else + val |= EDP_PSR_TP1_TIME_0us; + }else { +if (dev_priv->vbt.psr.tp1_wakeup_time >5 ) + val |= EDP_PSR_TP1_TIME_2500us; +else if (dev_priv->vbt.psr.tp1_wakeup_time >1 ) + val |= EDP_PSR_TP1_TIME_500us; +else if (dev_priv->vbt.psr.tp1_wakeup_time >0 ) + val |= EDP_PSR_TP1_TIME_100us; +else + val |= EDP_PSR_TP1_TIME_0us; + } +if (dev_priv->vbt.psr.is_tp_time_options) { +if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==0 ) + val |= EDP_PSR_TP2_TP3_TIME_500us; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==1 ) + val |= EDP_PSR_TP2_TP3_TIME_100us; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==2 ) + val |= EDP_PSR_TP2_TP3_TIME_2500us; +else + val |= EDP_PSR_TP2_TP3_TIME_0us; + }else { +if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) + val |= EDP_PSR_TP2_TP3_TIME_2500us; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >1 ) + val |= EDP_PSR_TP2_TP3_TIME_500us; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >0 ) + val |= EDP_PSR_TP2_TP3_TIME_100us; +else + val |= EDP_PSR_TP2_TP3_TIME_0us; + }if (intel_dp_source_supports_hbr2 (intel_dp) &&drm_dp_tps3_supported (intel_dp->dpcd)) val |=EDP_PSR_TP1_TP3_SEL ;@@ -405,16 +426,25 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) } val |=EDP_PSR2_FRAME_BEFORE_SU (dev_priv->psr.sink_sync_latency +1 ); - -if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) - val |=EDP_PSR2_TP2_TIME_2500 ; -else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >1 ) - val |=EDP_PSR2_TP2_TIME_500 ; -else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >0 ) - val |=EDP_PSR2_TP2_TIME_100 ; -else - val |=EDP_PSR2_TP2_TIME_50 ; - +if (dev_priv->vbt.psr.is_tp_time_options) { +if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==0 ) + val |=EDP_PSR2_TP2_TIME_500 ; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==1 ) + val |=EDP_PSR2_TP2_TIME_100 ; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time ==2 ) + val |=EDP_PSR2_TP2_TIME_2500 ; +else + val |=EDP_PSR2_TP2_TIME_50 ; + }else { +if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) + val |=EDP_PSR2_TP2_TIME_2500 ; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >1 ) + val |=EDP_PSR2_TP2_TIME_500 ; +else if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >0 ) + val |=EDP_PSR2_TP2_TIME_100 ; +else + val |=EDP_PSR2_TP2_TIME_50 ; + }I915_WRITE (EDP_PSR2_CTL , val); }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx