diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 2dbdcd103ead..b91dc7457b4b 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -1077,17 +1077,16 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp) | |||
1077 | 1077 | ||
1078 | if (!is_edp(intel_dp)) | 1078 | if (!is_edp(intel_dp)) |
1079 | return; | 1079 | return; |
1080 | DRM_DEBUG_KMS("Turn eDP VDD on\n"); | ||
1081 | 1080 | ||
1082 | WARN(intel_dp->want_panel_vdd, | 1081 | WARN(intel_dp->want_panel_vdd, |
1083 | "eDP VDD already requested on\n"); | 1082 | "eDP VDD already requested on\n"); |
1084 | 1083 | ||
1085 | intel_dp->want_panel_vdd = true; | 1084 | intel_dp->want_panel_vdd = true; |
1086 | 1085 | ||
1087 | if (ironlake_edp_have_panel_vdd(intel_dp)) { | 1086 | if (ironlake_edp_have_panel_vdd(intel_dp)) |
1088 | DRM_DEBUG_KMS("eDP VDD already on\n"); | ||
1089 | return; | 1087 | return; |
1090 | } | 1088 | |
1089 | DRM_DEBUG_KMS("Turning eDP VDD on\n"); | ||
1091 | 1090 | ||
1092 | if (!ironlake_edp_have_panel_power(intel_dp)) | 1091 | if (!ironlake_edp_have_panel_power(intel_dp)) |
1093 | ironlake_wait_panel_power_cycle(intel_dp); | 1092 | ironlake_wait_panel_power_cycle(intel_dp); |
@@ -1121,6 +1120,8 @@ static void ironlake_panel_vdd_off_sync(struct intel_dp *intel_dp) | |||
1121 | WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); | 1120 | WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); |
1122 | 1121 | ||
1123 | if (!intel_dp->want_panel_vdd && ironlake_edp_have_panel_vdd(intel_dp)) { | 1122 | if (!intel_dp->want_panel_vdd && ironlake_edp_have_panel_vdd(intel_dp)) { |
1123 | DRM_DEBUG_KMS("Turning eDP VDD off\n"); | ||
1124 | |||
1124 | pp = ironlake_get_pp_control(intel_dp); | 1125 | pp = ironlake_get_pp_control(intel_dp); |
1125 | pp &= ~EDP_FORCE_VDD; | 1126 | pp &= ~EDP_FORCE_VDD; |
1126 | 1127 | ||
@@ -1153,7 +1154,6 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) | |||
1153 | if (!is_edp(intel_dp)) | 1154 | if (!is_edp(intel_dp)) |
1154 | return; | 1155 | return; |
1155 | 1156 | ||
1156 | DRM_DEBUG_KMS("Turn eDP VDD off %d\n", intel_dp->want_panel_vdd); | ||
1157 | WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on"); | 1157 | WARN(!intel_dp->want_panel_vdd, "eDP VDD not forced on"); |
1158 | 1158 | ||
1159 | intel_dp->want_panel_vdd = false; | 1159 | intel_dp->want_panel_vdd = false; |