2123b28761
merged: silence-empty-ipi-mask-warning.patch merged: quiet-apm.patch merged: Input-increase-struct-ps2dev-cmdbuf-to-8-bytes.patch merged: Input-add-support-for-Cypress-PS2-Trackpads.patch merged: Input-cypress_ps2-fix-trackpadi-found-in-Dell-XPS12.patch merged: alps-v2.patch merged: userns-avoid-recursion-in-put_user_ns.patch merged: amd64_edac_fix_rank_count.patch merged: team-net-next-update-20130307.patch merged: uvcvideo-suspend-fix.patch merged: cfg80211-mac80211-disconnect-on-suspend.patch merged: mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.8.patch merged: mac80211-Dont-restart-sta-timer-if-not-running.patch merged: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch TODO: secure-boot TODO: ARM configs.
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
|
|
index 296cfc2..516e1e2 100644
|
|
--- a/drivers/gpu/drm/i915/intel_dp.c
|
|
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
|
@@ -350,7 +350,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
|
|
if (!is_edp(intel_dp))
|
|
return;
|
|
if (!ironlake_edp_have_panel_power(intel_dp) && !ironlake_edp_have_panel_vdd(intel_dp)) {
|
|
- WARN(1, "eDP powered off while attempting aux channel communication.\n");
|
|
+ DRM_ERROR("eDP powered off while attempting aux channel communication.\n");
|
|
DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n",
|
|
I915_READ(PCH_PP_STATUS),
|
|
I915_READ(PCH_PP_CONTROL));
|
|
@@ -447,7 +447,7 @@ intel_dp_aux_ch(struct intel_dp *intel_d
|
|
}
|
|
|
|
if (try == 3) {
|
|
- WARN(1, "dp_aux_ch not started status 0x%08x\n",
|
|
+ DRM_ERROR("dp_aux_ch not started status 0x%08x\n",
|
|
I915_READ(ch_ctl));
|
|
ret = -EBUSY;
|
|
goto out;
|
|
@@ -1024,8 +1024,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
|
|
return;
|
|
DRM_DEBUG_KMS("Turn eDP VDD on\n");
|
|
|
|
- WARN(intel_dp->want_panel_vdd,
|
|
- "eDP VDD already requested on\n");
|
|
+ if (intel_dp->want_panel_vdd)
|
|
+ DRM_ERROR("eDP VDD already requested on\n");
|
|
|
|
intel_dp->want_panel_vdd = true;
|
|
|
|
@@ -1090,7 +1090,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
|
|
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");
|
|
+ if (!intel_dp->want_panel_vdd)
|
|
+ DRM_ERROR("eDP VDD not forced on");
|
|
|
|
intel_dp->want_panel_vdd = false;
|
|
|
|
@@ -1160,7 +1161,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)
|
|
|
|
DRM_DEBUG_KMS("Turn eDP power off\n");
|
|
|
|
- WARN(!intel_dp->want_panel_vdd, "Need VDD to turn off panel\n");
|
|
+ if (!intel_dp->want_panel_vdd)
|
|
+ DRM_ERROR("Need VDD to turn off panel\n");
|
|
|
|
pp = ironlake_get_pp_control(dev_priv);
|
|
pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_BLC_ENABLE);
|