mesa: Changes to 'ubuntu'

2012-08-27 Thread Timo Aaltonen
 debian/changelog |6 +++
 debian/patches/118-remove-assertion.diff |   53 +++
 debian/patches/series|1 
 3 files changed, 60 insertions(+)

New commits:
commit 6c81233f1c5d6f54ba9c27d8377e473ec06e8cc6
Author: Timo Aaltonen 
Date:   Mon Aug 27 21:14:56 2012 +0300

Added 118-remove-assertion.diff from upstream (LP: #1042293).

diff --git a/debian/changelog b/debian/changelog
index f8567a2..9c4c89e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (9.0~git20120821.c1114c61-0ubuntu2) quantal; urgency=low
+
+  * Added 118-remove-assertion.diff from upstream (LP: #1042293).
+
+ -- Timo Aaltonen   Mon, 27 Aug 2012 21:12:44 +0300
+
 mesa (9.0~git20120821.c1114c61-0ubuntu1) quantal; urgency=low
 
   * Merge from unreleased debian git.
diff --git a/debian/patches/118-remove-assertion.diff 
b/debian/patches/118-remove-assertion.diff
new file mode 100644
index 000..14feeed
--- /dev/null
+++ b/debian/patches/118-remove-assertion.diff
@@ -0,0 +1,53 @@
+commit 4b8b6f385e855ecb6da0b7dea56e70e69d1517b9
+Author: Paul Berry 
+Date:   Wed Aug 22 08:01:58 2012 -0700
+
+i965/HiZ: remove assertion from intel_resolve_map_set().
+
+There are three possible resolve map states for each (level, layer) of
+a depth miptree: "needs HiZ resolve", "needs depth resolve", and
+"needs neither".  When HiZ was first implemented on i965, any attempt
+to directly transition between "needs HiZ resolve" and "needs depth
+resolve" without passing through the "needs neither" state would have
+been a bug indicating that a necessary resolve hadn't been performed.
+Accordingly, intel_resolve_map_set() contained an assertion to verify
+that no such direct transition happened.
+
+However, now that we support fast depth clears, there is a valid
+transition from the "needs HiZ resolve" to the "needs depth resolve"
+state.  When doing a fast depth clear, the old state of the buffer is
+irrelevant, since we are completely replacing it with the clear value,
+so it is not necessary to do any resolves before clearing--we can
+transition, if necessary, directly from the "needs HiZ resolve" state
+to the "needs depth resolve" state.
+
+To avoid spurious assertions in this valid case, this patch just
+removes the assertion.
+
+Reviewed-by: Eric Anholt 
+Reviewed-by: Chad Versace 
+
+diff --git a/src/mesa/drivers/dri/intel/intel_resolve_map.c 
b/src/mesa/drivers/dri/intel/intel_resolve_map.c
+index 471988d..04b5c94 100644
+--- a/src/mesa/drivers/dri/intel/intel_resolve_map.c
 b/src/mesa/drivers/dri/intel/intel_resolve_map.c
+@@ -29,8 +29,8 @@
+ /**
+  * \brief Set that the miptree slice at (level, layer) needs a resolve.
+  *
+- * \pre If a map element already exists with the given key, then
+- *  the new and existing element value must be identical.
++ * If a map element already exists with the given key, then the value is
++ * changed to the given value of \c need.
+  */
+ void
+ intel_resolve_map_set(struct intel_resolve_map *head,
+@@ -43,7 +43,7 @@ intel_resolve_map_set(struct intel_resolve_map *head,
+ 
+while (*tail) {
+   if ((*tail)->level == level && (*tail)->layer == layer) {
+-   assert((*tail)->need == need);
++ (*tail)->need = need;
+return;
+   }
+   prev = *tail;
diff --git a/debian/patches/series b/debian/patches/series
index 1d3510c..478b752 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 100_no_abi_tag.patch
 101_ubuntu_hidden_glname.patch
 #117-static-gallium.patch
+118-remove-assertion.diff


-- 
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/e1t63qm-0001ed...@vasks.debian.org



[bts-link] source package xorg

2012-08-27 Thread bts-link-upstream
#
# bts-link upstream status pull for source package xorg
# see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
#

user bts-link-upstr...@lists.alioth.debian.org

# remote status report for #681796 (http://bugs.debian.org/681796)
# Bug title: segmentation fault during suspend
#  * https://bugs.freedesktop.org/show_bug.cgi?id=52496
#  * remote status changed: NEEDINFO -> REOPENED
usertags 681796 - status-NEEDINFO
usertags 681796 + status-REOPENED

thanks


--
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/20120827163316.21684.82656.btsl...@sonntag.debian.org



intel-gpu-tools: Changes to 'upstream-unstable'

2012-08-27 Thread Timo Aaltonen
 Android.mk |  531 +
 Makefile.am|2 
 benchmarks/Makefile.am |4 
 configure.ac   |   19 
 debugger/Makefile.am   |2 
 demos/.gitignore   |2 
 demos/Makefile.am  |6 
 demos/intel_sprite_on.c| 1068 ++
 demos/sprite_on.c  | 1222 --
 lib/Makefile.am|5 
 lib/drmtest.c  |  495 ++--
 lib/drmtest.h  |   48 +
 lib/gen7_render.h  |  222 +
 lib/instdone.c |   30 
 lib/intel_batchbuffer.c|   50 -
 lib/intel_batchbuffer.h|   11 
 lib/intel_chipset.h|  102 ++
 lib/intel_dpio.c   |   94 ++
 lib/intel_drm.c|5 
 lib/intel_gpu_tools.h  |8 
 lib/intel_mmio.c   |   21 
 lib/intel_pci.c|2 
 lib/intel_reg.h|  276 ++
 lib/rendercopy.h   |9 
 lib/rendercopy_gen7.c  |  801 +++
 lib/rendercopy_i830.c  |  411 +++---
 man/Makefile.am|2 
 man/intel_infoframes.man   |   26 
 man/intel_panel_fitter.man |   50 +
 man/intel_reg_dumper.man   |   23 
 scripts/convert_itp.py |   17 
 scripts/display_debug.sh   |  172 
 shaders/ps/README  |1 
 shaders/ps/blit.g7a|   66 +
 shaders/ps/neg1_test.g7a   |9 
 tests/.gitignore   |   23 
 tests/Makefile.am  |   43 +
 tests/ZZ_hangman   |   34 
 tests/check_drm_clients|   30 
 tests/debugfs_emon_crash   |   26 
 tests/debugfs_reader   |   24 
 tests/debugfs_wedged   |   10 
 tests/drm_lib.sh   |   32 
 tests/flip_test.c  |  317 +++
 tests/gem_bad_length.c |2 
 tests/gem_basic.c  |   19 
 tests/gem_cpu_concurrent_blit.c|  142 +++
 tests/gem_cs_prefetch.c|2 
 tests/gem_ctx_bad_destroy.c|  109 ++
 tests/gem_ctx_bad_exec.c   |  125 +++
 tests/gem_ctx_basic.c  |  166 
 tests/gem_ctx_create.c |   64 +
 tests/gem_ctx_exec.c   |  139 +++
 tests/gem_exec_blt.c   |2 
 tests/gem_exec_faulting_reloc.c|   16 
 tests/gem_exec_nop.c   |2 
 tests/gem_fence_thrash.c   |   33 
 tests/gem_gtt_concurrent_blit.c|  145 +++
 tests/gem_gtt_cpu_tlb.c|  108 ++
 tests/gem_gtt_speed.c  |   83 +-
 tests/gem_linear_blits.c   |6 
 tests/gem_mmap.c   |   34 
 tests/gem_mmap_offset_exhaustion.c |   96 ++
 tests/gem_readwrite.c  |7 
 tests/gem_reg_read.c   |   98 ++
 tests/gem_ringfill.c   |  171 +++-
 tests/gem_set_tiling_vs_blt.c  |  269 ++
 tests/gem_set_tiling_vs_gtt.c  |  137 +++
 tests/gem_set_tiling_vs_pwrite.c   |   99 ++
 tests/gem_storedw_batches_loop.c   |7 
 tests/gem_storedw_loop_blt.c   |   18 
 tests/gem_storedw_loop_bsd.c   |   24 
 tests/gem_storedw_loop_render.c|   11 
 tests/gem_stress.c |5 
 tests/gem_tiled_blits.c|3 
 tests/gem_tiled_fence_blits.c  |3 
 tests/gem_tiled_partial_pwrite_pread.c |  294 +++
 tests/gem_tiled_pread_pwrite.c |2 
 tests/gem_unfence_active_buffers.c |  171 
 tests/gem_wait_render_timeout.c|  230 +
 tests/gen3_mixed_blits.c   |6 
 tests/gen3_render_linear_blits.c   |3 
 tests/gen3_render_mixed_blits.c|3 
 tests/gen3_render_tiledx_blits.c   |3 
 tests/gen3_render_tiledy_blits.c   |3 
 tests/module_reload|   41 +
 tests/pass.png |binary
 tests/prime_nv_api.c   |  408 ++
 tests/prime_nv_pcopy.c | 1329 +
 tests/prime_nv_test.c  |  582 ++
 tests/prime_self_import.c  |  123 +++
 tests/sysfs_l3_parity  |   27 
 tests/sysfs_rc6_residency.c|  119 ++
 tests/testdisplay.c|  591 ++
 tools/.gitignore   |4 
 tools/Makefile.am  |   13 
 tools/forcewaked.c |  106 --
 tools/intel_audio_dump.c   |  590 ++
 to

Bug#683695:

2012-08-27 Thread Kees de Jong
By the way I can't type anything, so I can't give you any logs. I have
a nVidia GT610.


-- 
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/CAAH150bmN=Q4K=mZu8k5O237Jm9LGMNiNs3CsJ7O-z0Z=fn...@mail.gmail.com



Bug#683695:

2012-08-27 Thread Kees de Jong
I can confirm this bug. Yesterday I installed Debian on my media
center and after rebooting it was stuck on Nouveau.
The error on my screen was as follows:

   Waiting for /dev to be fully populated...[ 5.053243] Error: Driver
'pcspkr' is already registred, aborting...
   6.566243] [drm] nouveau :01:00.0: illegal object class: 0x902d


Kind regards,
Kees


-- 
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/caah150anzflt7xenug7g8fjgr_vew14zdijz4t0e0xyq_ca...@mail.gmail.com