OSDN Git Service

drm/i915: reduce eDP VDD message verbose
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 30 Oct 2013 21:50:27 +0000 (19:50 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 31 Oct 2013 11:09:28 +0000 (12:09 +0100)
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: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_dp.c

index 2dbdcd1..b91dc74 100644 (file)
@@ -1077,17 +1077,16 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
 
        if (!is_edp(intel_dp))
                return;
-       DRM_DEBUG_KMS("Turn eDP VDD on\n");
 
        WARN(intel_dp->want_panel_vdd,
             "eDP VDD already requested on\n");
 
        intel_dp->want_panel_vdd = true;
 
-       if (ironlake_edp_have_panel_vdd(intel_dp)) {
-               DRM_DEBUG_KMS("eDP VDD already on\n");
+       if (ironlake_edp_have_panel_vdd(intel_dp))
                return;
-       }
+
+       DRM_DEBUG_KMS("Turning eDP VDD on\n");
 
        if (!ironlake_edp_have_panel_power(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));
 
        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 &= ~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))
                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");
 
        intel_dp->want_panel_vdd = false;