On Fri, 06 Apr 2018, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> On Fri, Apr 06, 2018 at 10:58:51PM +0530, vathsala nagaraju wrote:
>> From: Vathsala Nagaraju <vathsala.nagaraju@xxxxxxxxx>
>>
>> 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
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>> CC: Puthikorn Voravootivat <puthik@xxxxxxxxxxxx>
>>
>> Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@xxxxxxxxx>
>> Signed-off-by: Vathsala Nagaraju <vathsala.nagaraju@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/i915_drv.h | 1 +
>> drivers/gpu/drm/i915/intel_bios.c | 2 +-
>> drivers/gpu/drm/i915/intel_psr.c | 84 ++++++++++++++++++++++++++-------------
>> 3 files changed, 59 insertions(+), 28 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 5373b17..a47be19b 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -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 bdb_version;
>
> please keep the vbt stuff inside intel_bios.c
>
> so there at intel_bios.c you parse the vbt and based on the vbt version
> you export in a standard way to intel_psr.c
Exactly! struct intel_vbt_data is supposed to be an abstraction.
BR,
Jani.
>
>> } psr;
>>
>> struct {
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>> index c5c7530..cfefd32 100644
>> --- a/drivers/gpu/drm/i915/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/intel_bios.c
>> @@ -658,7 +658,7 @@ static int intel_bios_ssc_frequency(struct drm_i915_private *dev_priv,
>> DRM_DEBUG_KMS("No PSR BDB found.\n");
>> return;
>> }
>> -
>> + dev_priv->vbt.psr.bdb_version = bdb->version;
>> psr_table = &psr->psr_table[panel_type];
>>
>> dev_priv->vbt.psr.full_link = psr_table->full_link;
>> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
>> index 2d53f73..e470d5e 100644
>> --- a/drivers/gpu/drm/i915/intel_psr.c
>> +++ b/drivers/gpu/drm/i915/intel_psr.c
>> @@ -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.bdb_version >= 209 && IS_KABYLAKE(dev_priv)) {
>> + 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.bdb_version >= 209 && IS_KABYLAKE(dev_priv)) {
>> + 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.bdb_version >= 209 && IS_KABYLAKE(dev_priv)) {
>> + 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);
>> }
>>
>> --
>> 1.9.1
>>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
