~ubuntu-branches/ubuntu/trusty/pm-utils/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/11_nvidia_suspend.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-03-04 15:57:01 UTC
  • Revision ID: james.westby@ubuntu.com-20100304155701-uuh286qm7yiy16nr
Tags: 1.3.0~rc3-2git1
Upload current Debian packaging git head.

Add 11_nvidia_suspend.patch: Re-enable chvt quirk for nvidia driver, to
repair suspend with the current driver versions. (LP: #488720)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From 47356ebdc23835239d0284a6a498a27db83cb24e Mon Sep 17 00:00:00 2001
 
2
From: Chase Douglas <chase.douglas@canonical.com>
 
3
Date: Wed, 10 Feb 2010 19:20:48 +0000
 
4
Subject: [PATCH] Re-enable chvt for nVidia cards
 
5
 
 
6
nVidia cards require the chvt quirk. When the quirks were moved
 
7
to 98-video-quirk-db-handler nVidia systems were erroneously given
 
8
the --quirk-no-chvt parameter. Without the chvt, the user must
 
9
manually switch the vts to bring X back.
 
10
 
 
11
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
 
12
 
 
13
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25488
 
14
Bug-Ubuntu: https://launchpad.net/bugs/488720
 
15
---
 
16
 pm/sleep.d/98-video-quirk-db-handler |    3 +--
 
17
 1 files changed, 1 insertions(+), 2 deletions(-)
 
18
 
 
19
diff --git a/pm/sleep.d/98-video-quirk-db-handler b/pm/sleep.d/98-video-quirk-db-handler
 
20
index 77dada4..e0d40b5 100755
 
21
--- a/pm/sleep.d/98-video-quirk-db-handler
 
22
+++ b/pm/sleep.d/98-video-quirk-db-handler
 
23
@@ -359,9 +359,8 @@ case $1 in
 
24
            remove_parameters $possible_video_quirks
 
25
            add_parameters --quirk-no-chvt
 
26
        elif using_nvidia; then
 
27
-            # Ditto for nVidia binary drivers
 
28
+            # Ditto for nVidia binary drivers, but still must change vts.
 
29
            remove_parameters $possible_video_quirks
 
30
-           add_parameters --quirk-no-chvt
 
31
        elif using_fglrx; then
 
32
            # fglrx may or may not have to change vts, reports one
 
33
            # way or the other welcome.
 
34
-- 
 
35
1.6.3.3
 
36