xserver-xorg-video-intel: Changes to 'ubuntu'
debian/apport-gpu-error-intel.py | 12 ++++++++++--
debian/changelog | 28 +++++++++++++++-------------
2 files changed, 25 insertions(+), 15 deletions(-)
New commits:
commit 9b03235a7c5e9e3041628380fce296ab5ada0a7b
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 15 03:00:50 2011 -0700
* apport-gpu-error-intel.py:
- Omit the hexdigest code from the title if we have two or more
non-zero GPU error codes. A pair of error codes has proven to be an
adequately good unique identifier for bugs.
- Add latest SandyBridge GPU PCI IDs
diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index b39a983..e034ed3 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -46,8 +46,16 @@ pci_devices = [
{ 'name':'b43', 're':'(8086:2e42)' },
{ 'name':'clarkdale', 're':'(8086:0042)' },
{ 'name':'arrandale', 're':'(8086:0046)' },
- { 'name':'sandybridge', 're':'(8086:0102)' },
- { 'name':'sandybridgem','re':'(8086:0106)' },
+ { 'name':'sandybridge-hb', 're':'(8086:0100)' },
+ { 'name':'sandybridge-gt1', 're':'(8086:0102)' },
+ { 'name':'sandybridge-m-hb', 're':'(8086:0104)' },
+ { 'name':'sandybridge-m-gt1', 're':'(8086:0106)' },
+ { 'name':'sandybridge-s-hb', 're':'(8086:0108)' },
+ { 'name':'sandybridge-s', 're':'(8086:010a)' },
+ { 'name':'sandybridge-gt2', 're':'(8086:0112)' },
+ { 'name':'sandybridge-m-gt2', 're':'(8086:0116)' },
+ { 'name':'sandybridge-gt2+', 're':'(8086:0122)' },
+ { 'name':'sandybridge-m-gt2+','re':'(8086:0126)' },
]
for device in pci_devices:
device['rc'] = re.compile(device['re'], re.IGNORECASE)
diff --git a/debian/changelog b/debian/changelog
index b74d1ce..4c5f5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu2) natty; urgency=low
+
+ * apport-gpu-error-intel.py:
+ - Omit the hexdigest code from the title if we have two or more
+ non-zero GPU error codes. A pair of error codes has proven to be an
+ adequately good unique identifier for bugs.
+ - Add latest SandyBridge GPU PCI IDs
+
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 08 Mar 2011 13:25:45 -0800
+
xserver-xorg-video-intel (2:2.14.0-4ubuntu1) natty; urgency=low
* Merge from Debian unstable. Remaining Ubuntu changes:
@@ -20,28 +30,28 @@ xserver-xorg-video-intel (2:2.14.0-4ubuntu1) natty; urgency=low
- debian/patches/114_warnings_cleanup_part_2.patch:
+ Cherry picks to fix a large number of build warnings.
- debian/patches/111_fix_clipped_window_plane_offset.patch:
- - 112_fix_error_in_4c4ad555.patch:
+ - 112_fix_error_in_4c4ad555.patch:
+ Fix issue where vertical green line and strange colors shows up when
playing gstreamer with certain videos, when dragged. (LP 460677)
- debian/patches/113_remove_broken_max_base_addresses.patch:
- + Fixes GPU lockup during login with
+ + Fixes GPU lockup during login with
"Bad length (4) in MI_DISPLAY_BUFFER_INFO, [3, 3]" error messages
listed in the gpu dump text. (LP 710321)
- debian/patches/115_quell_vblank_counter_failed.patch:
- + Don't fill up Xorg.0.log with
+ + Don't fill up Xorg.0.log with
"get vblank counter failed: Invalid argument" warnings.
5 is enough. (LP 710594)
- debian/xserver-xorg-video-intel.preinst.in:
- debian/xserver-xorg-video-intel.postinst.in:
+ Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades. KMS
is the kernel default.
- * Pull prerequisite commit into
+ * Pull prerequisite commit into
109_dont_reconstruct_glyph_cache_on_rotate.patch. We mostly didn't notice
because the copy-fb codepath initialises the resources itself. Fixes
Pixmap assert on Xserver startup when copy-fb fails, such as on hybrid
graphics systems. (LP: #718620)
* debian/control:
- - Dropped Ubuntu change: remove a bunch of Conflicts/Replaces against
+ - Dropped Ubuntu change: remove a bunch of Conflicts/Replaces against
packages last seen in Hardy.
-- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 02 Mar 2011 14:12:35 +1100
@@ -88,14 +98,6 @@ xserver-xorg-video-intel (2:2.14.0-2) experimental; urgency=low
-- Cyril Brulebois <kibi@debian.org> Fri, 04 Feb 2011 15:37:47 +0100
-xserver-xorg-video-intel (2:2.14.0-1ubuntu13) natty; urgency=low
-
- * apport-gpu-error-intel.py: Omit the hexdigest code from the title if
- we have two or more non-zero GPU error codes. A pair of error codes
- has proven to be an adequately good unique identifier for bugs.
-
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 08 Mar 2011 13:25:45 -0800
-
xserver-xorg-video-intel (2:2.14.0-1ubuntu12) natty; urgency=low
* Pull prerequisite commit into
Reply to: