diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-16 11:03:20 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-11-16 11:03:20 -0500 |
| commit | 6494f2c3b13d79f6705faceb0efde9029bd56bbf (patch) | |
| tree | 08bda97609b2a3de4591de845a346c189e24948b /drm-i915-dp-stfu.patch | |
| parent | ec0fd9d87484200e995dfabc0b476293a5942018 (diff) | |
| download | kernel-6494f2c3b13d79f6705faceb0efde9029bd56bbf.tar.gz kernel-6494f2c3b13d79f6705faceb0efde9029bd56bbf.tar.xz kernel-6494f2c3b13d79f6705faceb0efde9029bd56bbf.zip | |
Linux v3.12-9888-gf63c482
Diffstat (limited to 'drm-i915-dp-stfu.patch')
| -rw-r--r-- | drm-i915-dp-stfu.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch index fb2e58ee9..c9132f6d3 100644 --- a/drm-i915-dp-stfu.patch +++ b/drm-i915-dp-stfu.patch @@ -1,17 +1,17 @@ diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index fb2fbc1..0aaf67d 100644 +index eb8139d..463e373 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -283,7 +283,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp) - pp_ctrl_reg = IS_VALLEYVIEW(dev) ? PIPEA_PP_CONTROL : PCH_PP_CONTROL; +@@ -320,7 +320,7 @@ intel_dp_check_edp(struct intel_dp *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(pp_stat_reg), - I915_READ(pp_ctrl_reg)); -@@ -376,7 +376,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, + I915_READ(_pp_stat_reg(intel_dp)), + I915_READ(_pp_ctrl_reg(intel_dp))); +@@ -436,7 +436,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, } if (try == 3) { @@ -20,28 +20,28 @@ index fb2fbc1..0aaf67d 100644 I915_READ(ch_ctl)); ret = -EBUSY; goto out; -@@ -995,8 +995,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp) +@@ -1084,8 +1084,8 @@ 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"); + if (intel_dp->want_panel_vdd) -+ DRM_ERROR("eDP VDD already requested on\n"); ++ DRM_ERROR("eDP VDD already requested on\n"); intel_dp->want_panel_vdd = true; -@@ -1070,7 +1070,8 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) +@@ -1160,7 +1160,8 @@ 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"); + if (!intel_dp->want_panel_vdd) + DRM_ERROR("eDP VDD not forced on"); intel_dp->want_panel_vdd = false; -@@ -1144,7 +1145,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp) +@@ -1233,7 +1234,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp) DRM_DEBUG_KMS("Turn eDP power off\n"); |