Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12c8ca9c authored by Manasi Navare's avatar Manasi Navare Committed by Ville Syrjälä
Browse files

drm/i915/dp: Remove -1/+1 from t11_t12 for Gen9_LP/CNP case 



Now the VBT.seq->t11_t12 value adds 100ms to both Gen9_LP
as well as non Gen9_LP cases so no need to special case
and do -1 during HW readout and +1 during pp_div write
for Gen9_LP/CNP case.

Reviewed-by: default avatarVille Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Suggested-by: default avatarVille Syrjala <ville.syrjala@linux.intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Clint Taylor <clinton.a.taylor@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1498504905-21067-2-git-send-email-manasi.d.navare@intel.com


Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 770a17a5

drivers/gpu/drm/i915/intel_dp.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -5203,12 +5203,8 @@ intel_pps_readout_hw_state(struct drm_i915_private *dev_priv, 
		   PANEL_POWER_DOWN_DELAY_SHIFT;

		   PANEL_POWER_DOWN_DELAY_SHIFT;





	if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {

	if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {

		u16 tmp = (pp_ctl & BXT_POWER_CYCLE_DELAY_MASK) >>

		seq->t11_t12 = ((pp_ctl & BXT_POWER_CYCLE_DELAY_MASK) >>

			BXT_POWER_CYCLE_DELAY_SHIFT;

				BXT_POWER_CYCLE_DELAY_SHIFT) * 1000;

		if (tmp > 0)

			seq->t11_t12 = (tmp - 1) * 1000;

		else

			seq->t11_t12 = 0;

	} else {

	} else {

		seq->t11_t12 = ((pp_div & PANEL_POWER_CYCLE_DELAY_MASK) >>

		seq->t11_t12 = ((pp_div & PANEL_POWER_CYCLE_DELAY_MASK) >>

		       PANEL_POWER_CYCLE_DELAY_SHIFT) * 1000;

		       PANEL_POWER_CYCLE_DELAY_SHIFT) * 1000;
@@ -5367,7 +5363,7 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev, 
	if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {

	if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {

		pp_div = I915_READ(regs.pp_ctrl);

		pp_div = I915_READ(regs.pp_ctrl);

		pp_div &= ~BXT_POWER_CYCLE_DELAY_MASK;

		pp_div &= ~BXT_POWER_CYCLE_DELAY_MASK;

		pp_div |= (DIV_ROUND_UP((seq->t11_t12 + 1), 1000)

		pp_div |= (DIV_ROUND_UP(seq->t11_t12, 1000)

				<< BXT_POWER_CYCLE_DELAY_SHIFT);

				<< BXT_POWER_CYCLE_DELAY_SHIFT);

	} else {

	} else {

		pp_div = ((100 * div)/2 - 1) << PP_REFERENCE_DIVIDER_SHIFT;

		pp_div = ((100 * div)/2 - 1) << PP_REFERENCE_DIVIDER_SHIFT;