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

Commit adddaaf4 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915/dp: split edp_panel_vdd_on() for reuse 



Introduce _edp_panel_vdd_on() that returns true if the call enabled vdd,
and a matching disable is needed. Keep edp_panel_vdd_on() as a helper
for when it is expected the vdd is off.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9dc40560

drivers/gpu/drm/i915/intel_dp.c

+16 −6
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ static struct intel_dp *intel_attached_dp(struct drm_connector *connector) 
}

}





static void intel_dp_link_down(struct intel_dp *intel_dp);

static void intel_dp_link_down(struct intel_dp *intel_dp);

static bool _edp_panel_vdd_on(struct intel_dp *intel_dp);

static void edp_panel_vdd_on(struct intel_dp *intel_dp);

static void edp_panel_vdd_on(struct intel_dp *intel_dp);

static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);

static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);
@@ -1162,23 +1163,21 @@ static u32 ironlake_get_pp_control(struct intel_dp *intel_dp) 
	return control;

	return control;

}

}





static void edp_panel_vdd_on(struct intel_dp *intel_dp)

static bool _edp_panel_vdd_on(struct intel_dp *intel_dp)

{

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 pp;

	u32 pp;

	u32 pp_stat_reg, pp_ctrl_reg;

	u32 pp_stat_reg, pp_ctrl_reg;

	bool need_to_disable = !intel_dp->want_panel_vdd;





	if (!is_edp(intel_dp))

	if (!is_edp(intel_dp))

		return;

		return false;



	WARN(intel_dp->want_panel_vdd,

	     "eDP VDD already requested on\n");





	intel_dp->want_panel_vdd = true;

	intel_dp->want_panel_vdd = true;





	if (edp_have_panel_vdd(intel_dp))

	if (edp_have_panel_vdd(intel_dp))

		return;

		return need_to_disable;





	intel_runtime_pm_get(dev_priv);

	intel_runtime_pm_get(dev_priv);
@@ -1204,6 +1203,17 @@ static void edp_panel_vdd_on(struct intel_dp *intel_dp) 
		DRM_DEBUG_KMS("eDP was not running\n");

		DRM_DEBUG_KMS("eDP was not running\n");

		msleep(intel_dp->panel_power_up_delay);

		msleep(intel_dp->panel_power_up_delay);

	}

	}



	return need_to_disable;

}



static void edp_panel_vdd_on(struct intel_dp *intel_dp)

{

	if (is_edp(intel_dp)) {

		bool vdd = _edp_panel_vdd_on(intel_dp);



		WARN(!vdd, "eDP VDD already requested on\n");

	}

}

}





static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)

static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)