Package: uswsusp
Version: 0.8-1.2
Severity: important
Tags: patch
Running the test mode shows that the 6460* entry introduces quirks
that are undesired for a T61p machine that has NV84 and uses nouveau
driver.
# s2ram -n
Machine matched entry 291:
sys_vendor = 'LENOVO'
sys_product = '6460*'
sys_version = ''
bios_version = ''
Fixes: 0x81 VBE_MODE S3_BIOS
This machine can be identified by:
sys_vendor = "LENOVO"
sys_product = "64608WU"
sys_version = "ThinkPad T61p"
bios_version = "7LETC1WW (2.21 )"
See http://suspend.sf.net/s2ram-support.html for details.
I have prepared a dedicated entry that matches this particular T61p by exact
product ID - see the attached patch.
-- System Information:
Debian Release: 5.0.4
APT prefers stable
APT policy: (700, 'stable'), (650, 'testing'), (600, 'unstable'), (570,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.33-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=cs_CZ.UTF-8, LC_CTYPE=cs_CZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages uswsusp depends on:
ii debconf [debconf-2.0] 1.5.24 Debian configuration management sy
ii libc6 2.10.2-6 Embedded GNU C Library: Shared lib
ii libdirectfb-1.0-0 1.0.1-11 direct frame buffer graphics - sha
ii libgcc1 1:4.3.2-1 GCC support library
ii libgcrypt11 1.4.5-2 LGPL Crypto library - runtime libr
ii libglib2.0-0 2.22.4-1 The GLib library of C routines
ii liblzo2-2 2.03-1 data compression library
ii libpci3 1:3.1.7-2 Linux PCI Utilities (shared librar
ii libsplashy1 0.3.13-5.1 Library to draw splash screen on b
ii libx86-1 1.1+ds1-6 x86 real-mode library
Versions of packages uswsusp recommends:
ii initramfs-tools 0.92l tools for generating an initramfs
ii mount 2.13.1.1-1 Tools for mounting and manipulatin
Versions of packages uswsusp suggests:
pn splashy <none> (no description available)
-- debconf information:
uswsusp/compute_checksum: false
uswsusp/no_snapshot:
uswsusp/suspend_loglevel:
uswsusp/no_swap:
uswsusp/resume_offset:
uswsusp/early_writeout: true
uswsusp/image_size: 955981332
uswsusp/compress: true
uswsusp/create_RSA_key: false
uswsusp/snapshot_device:
uswsusp/RSA_key_file: /etc/uswsusp.key
uswsusp/max_loglevel:
uswsusp/resume_device: /dev/mapper/vgglum1-swap_1
uswsusp/shutdown_method: platform
uswsusp/encrypt: false
uswsusp/splash: true
uswsusp/RSA_key_bits: 1024
uswsusp/continue_without_swap: true
>From 018dc89dbfccc0dcae151b8c3296d717c3a6d8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Capek?= <jan-consult...@capkovi.eu>
Date: Wed, 7 Apr 2010 12:08:41 +0200
Subject: [PATCH] T61p with NV84 - added dedicated whitelist entry
- nouveau driver doesn't need any extra quirks since it uses
exclusively KMS for resuming the video card
---
debian/patches/whitelist.patch | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/debian/patches/whitelist.patch b/debian/patches/whitelist.patch
index 2c785cf..f7ab789 100644
--- a/debian/patches/whitelist.patch
+++ b/debian/patches/whitelist.patch
@@ -20,3 +20,13 @@ Index: uswsusp-0.8/whitelist.c
/* Fatih Alabas https://bugzilla.novell.com/show_bug.cgi?id=230528 */
{ "Hewlett-Packard", "Presario M2000 (EQ547PA#*", "",
"", S3_BIOS|VBE_MODE },
/* Sitsofe Wheeler <sits...@yahoo.com> */
+@@ -568,6 +572,9 @@
+ { "LENOVO", "6366*", "", "",
S3_BIOS|S3_MODE },
+ /* Joerg Rueppel <shark...@gmx.net>, T61p, does not work with the
NVidia driver */
+ { "LENOVO", "6457*", "", "",
S3_BIOS|VBE_MODE },
++ { "LENOVO", "64608WU", "ThinkPad
T61p", "", 0 },
++ /* Jan Čapek <jan-consult...@capkovi.eu>, T61p with NV84 nvidia chip,
nouveau X.org
++ driver doesn't require any quirks */
+ { "LENOVO", "6460*", "", "",
S3_BIOS|VBE_MODE },
+ /* T61, Joe Nahmias <je...@debian.org>, debian bug #432018 */
+ { "LENOVO", "7658*", "", "",
S3_BIOS|S3_MODE },
--
1.7.0.3
