Commit 572a0d30 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pps: add locked intel_pps_wait_power_cycle 



Prefer keeping the unlocked variants hidden if possible. No functional
changes.

Reviewed-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4b712770deab9de8c3aeea8df35269433977038a.1610127741.git.jani.nikula@intel.com
parent 07eb5b1f

drivers/gpu/drm/i915/display/intel_dp.c

+1 −6
Original line number Diff line number Diff line
@@ -6324,13 +6324,8 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder) 
void intel_dp_encoder_shutdown(struct intel_encoder *intel_encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);

	intel_wakeref_t wakeref;



	if (!intel_dp_is_edp(intel_dp))

		return;



	with_intel_pps_lock(intel_dp, wakeref)

		wait_panel_power_cycle(intel_dp);

	intel_pps_wait_power_cycle(intel_dp);

}



static enum pipe vlv_active_pipe(struct intel_dp *intel_dp)

drivers/gpu/drm/i915/display/intel_pps.c

+12 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static void wait_panel_off(struct intel_dp *intel_dp) 
	wait_panel_status(intel_dp, IDLE_OFF_MASK, IDLE_OFF_VALUE);

}



void wait_panel_power_cycle(struct intel_dp *intel_dp)

static void wait_panel_power_cycle(struct intel_dp *intel_dp)

{

	struct drm_i915_private *i915 = dp_to_i915(intel_dp);

	ktime_t panel_power_on_time;
@@ -522,6 +522,17 @@ void wait_panel_power_cycle(struct intel_dp *intel_dp) 
	wait_panel_status(intel_dp, IDLE_CYCLE_MASK, IDLE_CYCLE_VALUE);

}



void intel_pps_wait_power_cycle(struct intel_dp *intel_dp)

{

	intel_wakeref_t wakeref;



	if (!intel_dp_is_edp(intel_dp))

		return;



	with_intel_pps_lock(intel_dp, wakeref)

		wait_panel_power_cycle(intel_dp);

}



static void wait_backlight_on(struct intel_dp *intel_dp)

{

	wait_remaining_ms_from_jiffies(intel_dp->last_power_on,

drivers/gpu/drm/i915/display/intel_pps.h

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ void intel_pps_on(struct intel_dp *intel_dp); 
void intel_pps_off(struct intel_dp *intel_dp);

void intel_pps_vdd_off_sync(struct intel_dp *intel_dp);

bool intel_pps_have_power(struct intel_dp *intel_dp);



void wait_panel_power_cycle(struct intel_dp *intel_dp);

void intel_pps_wait_power_cycle(struct intel_dp *intel_dp);



void intel_pps_init(struct intel_dp *intel_dp);

void intel_pps_encoder_reset(struct intel_dp *intel_dp);