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

Commit dada1a9f authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: fix initial timestamps for PP sequencing logic 



The initial jiffies value can be non-0, so set the inital panel power
sequencer timestamps accordingly. This didn't cause a problem on 64 bit
machines but on 32 bit jiffies is initially -300*HZ, so if the panel
power is initally off in the call from edp_panel_vdd_on()->
wait_panel_power_cycle() we'd wait up to ~300 sec more than needed.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ec5e0cfb

drivers/gpu/drm/i915/intel_dp.c

+10 −1
Original line number Diff line number Diff line
@@ -3491,6 +3491,13 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect 
	}

}



static void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp)

{

	intel_dp->last_power_cycle = jiffies;

	intel_dp->last_power_on = jiffies;

	intel_dp->last_backlight_off = jiffies;

}



static void

intel_dp_init_panel_power_sequencer(struct drm_device *dev,

				    struct intel_dp *intel_dp,
@@ -3835,8 +3842,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		BUG();

	}



	if (is_edp(intel_dp))

	if (is_edp(intel_dp)) {

		intel_dp_init_panel_power_timestamps(intel_dp);

		intel_dp_init_panel_power_sequencer(dev, intel_dp, &power_seq);

	}



	error = intel_dp_i2c_init(intel_dp, intel_connector, name);

	WARN(error, "intel_dp_i2c_init failed with error %d for port %c\n",