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

Commit cff5190c authored by Rodrigo Vivi's avatar Rodrigo Vivi Committed by Daniel Vetter
Browse files

drm/i915: PSR: Remove wrong LINK_DISABLE. 



This wrong logic and useless define came from first versions and
came along with all rework. Just now I notice how ugly, wrong and
useless this is.

val is already defined as 0 anyway and logic is completelly wrong
and useless. So let's starting the link_standby fix with this
cleaning.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarDurgadoss R <durgadoss.r@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0b4a2a36

drivers/gpu/drm/i915/i915_reg.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -2688,7 +2688,6 @@ enum skl_disp_power_wells { 
#define EDP_PSR_CTL(dev)			(EDP_PSR_BASE(dev) + 0)

#define EDP_PSR_CTL(dev)			(EDP_PSR_BASE(dev) + 0)

#define   EDP_PSR_ENABLE			(1<<31)

#define   EDP_PSR_ENABLE			(1<<31)

#define   BDW_PSR_SINGLE_FRAME			(1<<30)

#define   BDW_PSR_SINGLE_FRAME			(1<<30)

#define   EDP_PSR_LINK_DISABLE			(0<<27)

#define   EDP_PSR_LINK_STANDBY			(1<<27)

#define   EDP_PSR_LINK_STANDBY			(1<<27)

#define   EDP_PSR_MIN_LINK_ENTRY_TIME_MASK	(3<<25)

#define   EDP_PSR_MIN_LINK_ENTRY_TIME_MASK	(3<<25)

#define   EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES	(0<<25)

#define   EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES	(0<<25)

drivers/gpu/drm/i915/intel_psr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -269,8 +269,7 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) 
		val |= EDP_PSR_TP2_TP3_TIME_0us;

		val |= EDP_PSR_TP2_TP3_TIME_0us;

		val |= EDP_PSR_TP1_TIME_0us;

		val |= EDP_PSR_TP1_TIME_0us;

		val |= EDP_PSR_SKIP_AUX_EXIT;

		val |= EDP_PSR_SKIP_AUX_EXIT;

	} else

	}

		val |= EDP_PSR_LINK_DISABLE;





	I915_WRITE(EDP_PSR_CTL(dev), val |

	I915_WRITE(EDP_PSR_CTL(dev), val |

		   (IS_BROADWELL(dev) ? 0 : link_entry_time) |

		   (IS_BROADWELL(dev) ? 0 : link_entry_time) |