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

Commit b0665d57 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: reduce eDP VDD message verbose 



Now we only print messages when we actually enable VDD and when we
actually disable VDD.

The changes in the last commit triggered a big number of messages
while the driver was being initialized, and I thought we were toggling
things on/off too many times, but that was not really true: we were
just being too verbose.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8a5e6aeb

drivers/gpu/drm/i915/intel_dp.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1077,17 +1077,16 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp) 




	if (!is_edp(intel_dp))

	if (!is_edp(intel_dp))

		return;

		return;

	DRM_DEBUG_KMS("Turn eDP VDD on\n");





	WARN(intel_dp->want_panel_vdd,

	WARN(intel_dp->want_panel_vdd,

	     "eDP VDD already requested on\n");

	     "eDP VDD already requested on\n");





	intel_dp->want_panel_vdd = true;

	intel_dp->want_panel_vdd = true;





	if (ironlake_edp_have_panel_vdd(intel_dp)) {

	if (ironlake_edp_have_panel_vdd(intel_dp))

		DRM_DEBUG_KMS("eDP VDD already on\n");

		return;

		return;

	}



	DRM_DEBUG_KMS("Turning eDP VDD on\n");





	if (!ironlake_edp_have_panel_power(intel_dp))

	if (!ironlake_edp_have_panel_power(intel_dp))

		ironlake_wait_panel_power_cycle(intel_dp);

		ironlake_wait_panel_power_cycle(intel_dp);
@@ -1121,6 +1120,8 @@ static void ironlake_panel_vdd_off_sync(struct intel_dp *intel_dp) 
	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));

	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));





	if (!intel_dp->want_panel_vdd && ironlake_edp_have_panel_vdd(intel_dp)) {

	if (!intel_dp->want_panel_vdd && ironlake_edp_have_panel_vdd(intel_dp)) {

		DRM_DEBUG_KMS("Turning eDP VDD off\n");



		pp = ironlake_get_pp_control(intel_dp);

		pp = ironlake_get_pp_control(intel_dp);

		pp &= ~EDP_FORCE_VDD;

		pp &= ~EDP_FORCE_VDD;
@@ -1153,7 +1154,6 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) 
	if (!is_edp(intel_dp))

	if (!is_edp(intel_dp))

		return;

		return;





	DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd);

	WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");

	WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on");





	intel_dp->want_panel_vdd = false;

	intel_dp->want_panel_vdd = false;