debian/changelog | 16 ++++++++ debian/patches/102_gen6_invalidate_texture_cache.patch | 33 +++++++++++++++++ debian/patches/117_946gz_isreally_965g.patch | 24 ++++++++++++ debian/patches/series | 2 + 4 files changed, 75 insertions(+)
New commits: commit 823bac26ea610180c9c4509ba90e14fee5eeeaf8 Author: Robert Hooker <robert.hoo...@canonical.com> Date: Mon Apr 11 22:28:12 2011 -0400 Add 102_gen6_invalidate_texture_cache.patch Cherry-pick from upstream commit 25521900df11bc710 to fix menu corruption in KDE on sandybridge. diff --git a/debian/changelog b/debian/changelog index a63e960..a880598 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-intel (2:2.14.0-4ubuntu7) natty; urgency=low + + * Add 102_gen6_invalidate_texture_cache.patch: Fix corruption in KDE + menus on sandybridge GPUs. (LP: #750964) + + -- Robert Hooker <sarv...@ubuntu.com> Mon, 11 Apr 2011 14:00:58 -0400 + xserver-xorg-video-intel (2:2.14.0-4ubuntu6) natty; urgency=low * Add 117_946gz_isreally_965g.patch: 946gz was listed as a 915-family diff --git a/debian/patches/102_gen6_invalidate_texture_cache.patch b/debian/patches/102_gen6_invalidate_texture_cache.patch new file mode 100644 index 0000000..c6e8c5b --- /dev/null +++ b/debian/patches/102_gen6_invalidate_texture_cache.patch @@ -0,0 +1,33 @@ +From 25521900df11bc71020ee80db2223f979bec5ec6 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu, 07 Apr 2011 14:09:30 +0000 +Subject: gen6: Invalidate texture cache + +Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> +--- +diff --git a/src/i965_reg.h b/src/i965_reg.h +index 3953dab..df41fba 100644 +--- a/src/i965_reg.h ++++ b/src/i965_reg.h +@@ -169,6 +169,7 @@ + #define BRW_PIPE_CONTROL_DEPTH_STALL (1 << 13) + #define BRW_PIPE_CONTROL_WC_FLUSH (1 << 12) + #define BRW_PIPE_CONTROL_IS_FLUSH (1 << 11) ++#define BRW_PIPE_CONTROL_TC_FLUSH (1 << 10) + #define BRW_PIPE_CONTROL_NOTIFY_ENABLE (1 << 8) + #define BRW_PIPE_CONTROL_GLOBAL_GTT (1 << 2) + #define BRW_PIPE_CONTROL_LOCAL_PGTT (0 << 2) +diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c +index 2e1b7d9..282d8ab 100644 +--- a/src/intel_batchbuffer.c ++++ b/src/intel_batchbuffer.c +@@ -157,6 +157,7 @@ void intel_batch_emit_flush(ScrnInfoPtr scrn) + BEGIN_BATCH(4); + OUT_BATCH(BRW_PIPE_CONTROL | (4 - 2)); + OUT_BATCH(BRW_PIPE_CONTROL_WC_FLUSH | ++ BRW_PIPE_CONTROL_TC_FLUSH | + BRW_PIPE_CONTROL_NOWRITE); + OUT_BATCH(0); /* write address */ + OUT_BATCH(0); /* write data */ +-- +cgit v0.8.3-6-g21f6 diff --git a/debian/patches/series b/debian/patches/series index d4501e7..5acc86c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ # Ubuntu patches 101_copy-fb.patch +102_gen6_invalidate_texture_cache.patch 107_solid_nullptr_check.patch 109_dont_reconstruct_glyph_cache_on_rotate.patch 110_warnings_cleanup.patch commit 34c2fc4addb10ac595d792313dc763ecb6ab2647 Author: Robert Hooker <robert.hoo...@canonical.com> Date: Mon Apr 11 22:26:29 2011 -0400 Import changes from 2:2.14.0-4ubuntu6 release. diff --git a/debian/changelog b/debian/changelog index 418a2ed..a63e960 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xserver-xorg-video-intel (2:2.14.0-4ubuntu6) natty; urgency=low + + * Add 117_946gz_isreally_965g.patch: 946gz was listed as a 915-family + chip but it's actually just a marketing name for 965g. Fixes a GPU + lockup that occurs with this hardware during boot. + (LP: #742425) + + -- Bryce Harrington <br...@ubuntu.com> Fri, 01 Apr 2011 13:20:38 -0700 + xserver-xorg-video-intel (2:2.14.0-4ubuntu5) natty; urgency=low * apport-gpu-error-intel.py: Don't file gpu lockup bug reports for older diff --git a/debian/patches/117_946gz_isreally_965g.patch b/debian/patches/117_946gz_isreally_965g.patch new file mode 100644 index 0000000..6d81d78 --- /dev/null +++ b/debian/patches/117_946gz_isreally_965g.patch @@ -0,0 +1,24 @@ +commit 537a836dd6db384d53b52eb457a7d257c440217f +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Apr 1 07:10:25 2011 +0100 + + 946GZ is a 965G! + + Sales & Marketing score another victory in confusing me. + + Bugzila: https://bugs.freedesktop.org/show_bug.cgi?id=35854 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +diff --git a/src/intel_module.c b/src/intel_module.c +index f6cc6d4..8416544 100644 +--- a/src/intel_module.c ++++ b/src/intel_module.c +@@ -323,7 +323,7 @@ void intel_detect_chipset(ScrnInfoPtr scrn, + break; + case PCI_CHIP_I946_GZ: + chipset->name = "946GZ"; +- chipset->info = &intel_i915_info; ++ chipset->info = &intel_i965_info; + break; + case PCI_CHIP_I965_GM: + chipset->name = "965GM"; diff --git a/debian/patches/series b/debian/patches/series index 67b022f..d4501e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 113_remove_broken_max_base_addresses.patch 114_warnings_cleanup_part_2.patch 115_quell_vblank_counter_failed.patch +117_946gz_isreally_965g.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1q9tmb-0005yc...@alioth.debian.org