summaryrefslogtreecommitdiffstats
path: root/drm-i915-dp-stfu.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-03 08:27:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-03 13:32:30 -0400
commitdeb816ab2a9e56c61f86b5fd641185ea2fd4fbc0 (patch)
treeb3c6f07375b0eedf0f6a790c4d678ba8a02b600e /drm-i915-dp-stfu.patch
parent94a5a8a2cbbfd22a31cb68d52661ad80ec9d2bb2 (diff)
downloadkernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.gz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.xz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.zip
Linux v3.9-8933-gce85722
- First DRM merge
Diffstat (limited to 'drm-i915-dp-stfu.patch')
-rw-r--r--drm-i915-dp-stfu.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch
index 78fb5fe60..fb2e58ee9 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 f61cb79..64a24c0 100644
+index fb2fbc1..0aaf67d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -315,7 +315,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
- if (!is_edp(intel_dp))
- return;
+@@ -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;
+
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));
-@@ -446,7 +446,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
+ I915_READ(pp_stat_reg),
+ I915_READ(pp_ctrl_reg));
+@@ -376,7 +376,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
}
if (try == 3) {
@@ -20,7 +20,7 @@ index f61cb79..64a24c0 100644
I915_READ(ch_ctl));
ret = -EBUSY;
goto out;
-@@ -1083,8 +1083,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
+@@ -995,8 +995,8 @@ void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp)
return;
DRM_DEBUG_KMS("Turn eDP VDD on\n");
@@ -31,7 +31,7 @@ index f61cb79..64a24c0 100644
intel_dp->want_panel_vdd = true;
-@@ -1151,7 +1151,8 @@ void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)
+@@ -1070,7 +1070,8 @@ 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);
@@ -41,7 +41,7 @@ index f61cb79..64a24c0 100644
intel_dp->want_panel_vdd = false;
-@@ -1221,7 +1222,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
+@@ -1144,7 +1145,8 @@ void ironlake_edp_panel_off(struct intel_dp *intel_dp)
DRM_DEBUG_KMS("Turn eDP power off\n");
@@ -49,5 +49,5 @@ index f61cb79..64a24c0 100644
+ if (!intel_dp->want_panel_vdd)
+ DRM_ERROR("Need VDD to turn off panel\n");
- pp = ironlake_get_pp_control(dev_priv);
+ pp = ironlake_get_pp_control(intel_dp);
/* We need to switch off panel power _and_ force vdd, for otherwise some