~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/bugfix/x86/drm-i915-make-sure-we-shut-off-the-panel-in-eDP-conf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
From c4c556fe14db045460f04be489650cf6c32fafd6 Mon Sep 17 00:00:00 2001
2
 
From: Jesse Barnes <jbarnes@virtuousgeek.org>
3
 
Date: Mon, 26 Jul 2010 13:51:22 -0700
4
 
Subject: [PATCH 8/8] drm/i915: make sure we shut off the panel in eDP configs
5
 
 
6
 
commit 5620ae29f1eabe655f44335231b580a78c8364ea upstream.
7
 
 
8
 
Fix error from the last pull request.  Making sure we shut the panel off
9
 
is more correct and saves power.
10
 
 
11
 
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
12
 
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13
 
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
14
 
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
15
 
---
16
 
 drivers/gpu/drm/i915/intel_dp.c |    2 +-
17
 
 1 files changed, 1 insertions(+), 1 deletions(-)
18
 
 
19
 
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
20
 
index 40ca37a..6b62762 100644
21
 
--- a/drivers/gpu/drm/i915/intel_dp.c
22
 
+++ b/drivers/gpu/drm/i915/intel_dp.c
23
 
@@ -757,7 +757,7 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
24
 
                        intel_dp_link_down(intel_output, dp_priv->DP);
25
 
                        if (IS_eDP(intel_output)) {
26
 
                                ironlake_edp_backlight_off(dev);
27
 
-                               ironlake_edp_backlight_off(dev);
28
 
+                               ironlake_edp_panel_off(dev);
29
 
                        }
30
 
                }
31
 
        } else {
32
 
1.7.1
33