Commit c520869a authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pps: add higher level intel_pps_init() call 



Add a new init call to be called only once, unlike some of the other
various init calls. This lets us hide more functions within
intel_pps.c. 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/290865ed9b0ea79120222a24c233a2d596239076.1610127741.git.jani.nikula@intel.com
parent f033d7eb

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

+1 −8
Original line number Diff line number Diff line
@@ -7077,14 +7077,11 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 
	struct drm_display_mode *downclock_mode = NULL;

	bool has_dpcd;

	enum pipe pipe = INVALID_PIPE;

	intel_wakeref_t wakeref;

	struct edid *edid;



	if (!intel_dp_is_edp(intel_dp))

		return true;



	INIT_DELAYED_WORK(&intel_dp->panel_vdd_work, edp_panel_vdd_work);



	/*

	 * On IBX/CPT we may get here with LVDS already registered. Since the

	 * driver uses the only internal power sequencer available for both
@@ -7100,11 +7097,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, 
		return false;

	}



	with_intel_pps_lock(intel_dp, wakeref) {

		intel_dp_init_panel_power_timestamps(intel_dp);

		intel_dp_pps_init(intel_dp);

		intel_pps_vdd_sanitize(intel_dp);

	}

	intel_pps_init(intel_dp);



	/* Cache DPCD and EDID for edp. */

	has_dpcd = intel_edp_init_dpcd(intel_dp);

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

+15 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ void intel_pps_vdd_off_sync(struct intel_dp *intel_dp) 
		intel_pps_vdd_off_sync_unlocked(intel_dp);

}



void edp_panel_vdd_work(struct work_struct *__work)

static void edp_panel_vdd_work(struct work_struct *__work)

{

	struct intel_dp *intel_dp =

		container_of(to_delayed_work(__work),
@@ -1078,7 +1078,7 @@ bool intel_pps_have_power(struct intel_dp *intel_dp) 
	return have_power;

}



void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp)

static void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp)

{

	intel_dp->panel_power_off_time = ktime_get_boottime();

	intel_dp->last_power_on = jiffies;
@@ -1348,3 +1348,16 @@ void intel_dp_pps_init(struct intel_dp *intel_dp) 
		intel_dp_init_panel_power_sequencer_registers(intel_dp, false);

	}

}



void intel_pps_init(struct intel_dp *intel_dp)

{

	intel_wakeref_t wakeref;



	INIT_DELAYED_WORK(&intel_dp->panel_vdd_work, edp_panel_vdd_work);



	with_intel_pps_lock(intel_dp, wakeref) {

		intel_dp_init_panel_power_timestamps(intel_dp);

		intel_dp_pps_init(intel_dp);

		intel_pps_vdd_sanitize(intel_dp);

	}

}

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

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ bool intel_pps_vdd_on_unlocked(struct intel_dp *intel_dp); 
void intel_pps_vdd_off_unlocked(struct intel_dp *intel_dp, bool sync);

void intel_pps_on_unlocked(struct intel_dp *intel_dp);

void intel_pps_off_unlocked(struct intel_dp *intel_dp);

void edp_panel_vdd_work(struct work_struct *__work);



void intel_pps_vdd_sanitize(struct intel_dp *intel_dp);

void intel_pps_vdd_on(struct intel_dp *intel_dp);
@@ -42,9 +41,9 @@ bool intel_pps_have_power(struct intel_dp *intel_dp); 


void wait_panel_power_cycle(struct intel_dp *intel_dp);



void intel_pps_init(struct intel_dp *intel_dp);

void intel_dp_pps_init(struct intel_dp *intel_dp);

void intel_power_sequencer_reset(struct drm_i915_private *i915);

void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp);



void vlv_init_panel_power_sequencer(struct intel_encoder *encoder,

				    const struct intel_crtc_state *crtc_state);