diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 09:03:50 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-25 09:03:50 -0400 |
| commit | e3ad20d482bb27ca42482280692ece86f0876904 (patch) | |
| tree | cbcc2ac4e422ef802ef4a18c41256acede4be0a6 /drm-i915-dp-stfu.patch | |
| parent | 2a6c66eb954a997fd019c5465cc46662b6acaf34 (diff) | |
| download | kernel-e3ad20d482bb27ca42482280692ece86f0876904.tar.gz kernel-e3ad20d482bb27ca42482280692ece86f0876904.tar.xz kernel-e3ad20d482bb27ca42482280692ece86f0876904.zip | |
Linux v3.4-7644-g07acfc2
Diffstat (limited to 'drm-i915-dp-stfu.patch')
| -rw-r--r-- | drm-i915-dp-stfu.patch | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/drm-i915-dp-stfu.patch b/drm-i915-dp-stfu.patch index 8948229dc..a8b395199 100644 --- a/drm-i915-dp-stfu.patch +++ b/drm-i915-dp-stfu.patch @@ -1,21 +1,8 @@ -From 04a43e2598db35b3d0ec25925bb8475b5c0a3809 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Fri, 16 Mar 2012 16:39:11 -0400 -Subject: [PATCH] drm/i915/dp: Use DRM_ERROR not WARN for sanity checks - -These are noisy as shit and creating a ton of abrt reports. I don't -need more, thanks. Proper fix upstream eventually. - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c -index 94f860c..6bf27c9 100644 +index 71c7096..5defdd5 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -331,7 +331,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp) +@@ -347,7 +347,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)) { @@ -24,7 +11,7 @@ index 94f860c..6bf27c9 100644 DRM_DEBUG_KMS("Status 0x%08x Control 0x%08x\n", I915_READ(PCH_PP_STATUS), I915_READ(PCH_PP_CONTROL)); -@@ -386,7 +386,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, +@@ -397,7 +397,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, } if (try == 3) { @@ -33,7 +20,7 @@ index 94f860c..6bf27c9 100644 I915_READ(ch_ctl)); return -EBUSY; } -@@ -992,8 +992,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp) +@@ -1018,8 +1018,8 @@ static void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp) return; DRM_DEBUG_KMS("Turn eDP VDD on\n"); @@ -44,7 +31,7 @@ index 94f860c..6bf27c9 100644 intel_dp->want_panel_vdd = true; -@@ -1058,7 +1058,8 @@ static void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync) +@@ -1084,7 +1084,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); @@ -54,16 +41,14 @@ index 94f860c..6bf27c9 100644 intel_dp->want_panel_vdd = false; -@@ -1128,7 +1129,8 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp) +@@ -1154,7 +1155,9 @@ 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, "Cannot turn power off while VDD is on\n"); + if (intel_dp->want_panel_vdd) + DRM_ERROR("Cannot turn power off while VDD is on\n"); ++ + ironlake_panel_vdd_off_sync(intel_dp); /* finish any pending work */ pp = ironlake_get_pp_control(dev_priv); - pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE); --- -1.7.7.6 - |