date:20140201

xserver-xorg-video-intel: Changes to 'upstream-experimental'

2014-02-01 Thread Timo Aaltonen

 NEWS   |   73 +
 configure.ac   |   23 +
 src/intel_device.c |4 
 src/intel_module.c |8 
 src/sna/fb/fb.h|5 
 src/sna/fb/fbpush.c|2 
 src/sna/gen2_render.c  |   59 ++--
 src/sna/gen3_render.c  |   50 ++--
 src/sna/gen4_render.c  |  150 
 src/sna/gen4_vertex.c  |2 
 src/sna/gen5_render.c  |   22 +
 src/sna/gen6_render.c  |   24 +
 src/sna/gen7_render.c  |   24 +
 src/sna/gen8_render.c  |   24 +
 src/sna/gen8_vertex.c  |2 
 src/sna/kgem.c |  462 +++--
 src/sna/kgem.h |5 
 src/sna/sna.h  |   28 +-
 src/sna/sna_accel.c|  425 --
 src/sna/sna_blt.c  |   97 ---
 src/sna/sna_composite.c|   13 -
 src/sna/sna_damage.c   |  447 +++
 src/sna/sna_display.c  |  314 +++--
 src/sna/sna_dri.c  |   82 --
 src/sna/sna_driver.c   |   35 ++
 src/sna/sna_glyphs.c   |   21 -
 src/sna/sna_render.c   |5 
 src/sna/sna_render.h   |7 
 src/sna/sna_tiling.c   |2 
 src/sna/sna_trapezoids.c   |6 
 src/sna/sna_trapezoids_boxes.c |   19 -
 src/sna/sna_trapezoids_imprecise.c |   13 -
 src/sna/sna_trapezoids_mono.c  |   38 +--
 src/sna/sna_trapezoids_precise.c   |   13 -
 src/uxa/intel_display.c|   10 
 src/uxa/intel_dri.c|   10 
 src/uxa/intel_glamor.c |   16 +
 src/uxa/intel_glamor.h |4 
 src/uxa/intel_video.c  |   13 -
 tools/virtual.c|   46 +++
 40 files changed, 1625 insertions(+), 978 deletions(-)

New commits:
commit 2c4b2ed558bec3b71077fb12cc4e008819fa
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 17:59:29 2014 +

2.99.909 snapshot

diff --git a/NEWS b/NEWS
index 83bf809..63655d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Snapshot 2.99.909 (2013-02-01)
+==
+Pass the brown paper bag. Ridiculously stupid bug in last minute coding.
+
+  * Add Xv support using glamor acceleration in addition to adaptors
+provided by the UXA backend.
+
+  * Fix overeager discarding of CPU damage
+Regression in 2.99.908 :(
+https://bugs.freedesktop.org/show_bug.cgi?id=74327
+
+
 Snapshot 2.99.908 (2013-01-31)
 ==
 A couple of regressions dashed the hopes that .907 was to be the final
diff --git a/configure.ac b/configure.ac
index 4e93f95..f7a6d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.99.908],
+[2.99.909],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 495bf89496a96eff0b2c5b6a95aa29df8d7fbc81
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 18:57:06 2014 +

sna: Apply drawable offsets to partial CPU damage being replaced

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1fbbddc..aecae51 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2424,6 +2424,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv-cpu_bo  !priv-cpu_bo-flush 
__kgem_bo_is_busy(sna-kgem, priv-cpu_bo)) {
if (!region_subsumes_pixmap(region, pixmap)) {
+   if (get_drawable_deltas(drawable, pixmap, dx, 
dy))
+   RegionTranslate(region, dx, dy);
+
sna_damage_subtract(priv-cpu_damage, region);
if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | 
MOVE_ASYNC_HINT)) {
sna_pixmap_free_cpu(sna, priv, false);

commit 2ba8d40bf7e4d3e8fa541c001f82aa65f26bed3a
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 18:13:04 2014 +

sna: Don't discard the GPU prior to using it for stashing CPU damage

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 7d219a4..1fbbddc 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2412,30 +2412,31 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
if (sna_damage_is_all(priv-cpu_damage,
  pixmap-drawable.width,
  pixmap-drawable.height)) {
+   bool discard_gpu = priv-cpu;
+
DBG((%s: pixmap=%ld all damaged on CPU\n,

xserver-xorg-video-intel: Changes to 'ubuntu'

2014-02-01 Thread Timo Aaltonen

 NEWS   |   73 +
 configure.ac   |   23 +
 debian/changelog   |   16 -
 src/intel_device.c |4 
 src/intel_module.c |8 
 src/sna/fb/fb.h|5 
 src/sna/fb/fbpush.c|2 
 src/sna/gen2_render.c  |   59 ++--
 src/sna/gen3_render.c  |   50 ++--
 src/sna/gen4_render.c  |  150 
 src/sna/gen4_vertex.c  |2 
 src/sna/gen5_render.c  |   22 +
 src/sna/gen6_render.c  |   24 +
 src/sna/gen7_render.c  |   24 +
 src/sna/gen8_render.c  |   24 +
 src/sna/gen8_vertex.c  |2 
 src/sna/kgem.c |  462 +++--
 src/sna/kgem.h |5 
 src/sna/sna.h  |   28 +-
 src/sna/sna_accel.c|  425 --
 src/sna/sna_blt.c  |   97 ---
 src/sna/sna_composite.c|   13 -
 src/sna/sna_damage.c   |  447 +++
 src/sna/sna_display.c  |  314 +++--
 src/sna/sna_dri.c  |   82 --
 src/sna/sna_driver.c   |   35 ++
 src/sna/sna_glyphs.c   |   21 -
 src/sna/sna_render.c   |5 
 src/sna/sna_render.h   |7 
 src/sna/sna_tiling.c   |2 
 src/sna/sna_trapezoids.c   |6 
 src/sna/sna_trapezoids_boxes.c |   19 -
 src/sna/sna_trapezoids_imprecise.c |   13 -
 src/sna/sna_trapezoids_mono.c  |   38 +--
 src/sna/sna_trapezoids_precise.c   |   13 -
 src/uxa/intel_display.c|   10 
 src/uxa/intel_dri.c|   10 
 src/uxa/intel_glamor.c |   16 +
 src/uxa/intel_glamor.h |4 
 src/uxa/intel_video.c  |   13 -
 tools/virtual.c|   46 +++
 41 files changed, 1631 insertions(+), 988 deletions(-)

New commits:
commit bb9a196da407280b75efcb175f373df3753e3ef4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:07:26 2014 +0200

bump the version

diff --git a/debian/changelog b/debian/changelog
index 3f4a883..9e4af6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-xserver-xorg-video-intel (2:2.99.907-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  [ Timo Aaltonen ]
-  * New upstream prerelease.
-
-  [ Maarten Lankhorst ]
   * New upstream prerelease.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300

commit 2c4b2ed558bec3b71077fb12cc4e008819fa
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 17:59:29 2014 +

2.99.909 snapshot

diff --git a/NEWS b/NEWS
index 83bf809..63655d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Snapshot 2.99.909 (2013-02-01)
+==
+Pass the brown paper bag. Ridiculously stupid bug in last minute coding.
+
+  * Add Xv support using glamor acceleration in addition to adaptors
+provided by the UXA backend.
+
+  * Fix overeager discarding of CPU damage
+Regression in 2.99.908 :(
+https://bugs.freedesktop.org/show_bug.cgi?id=74327
+
+
 Snapshot 2.99.908 (2013-01-31)
 ==
 A couple of regressions dashed the hopes that .907 was to be the final
diff --git a/configure.ac b/configure.ac
index 4e93f95..f7a6d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.99.908],
+[2.99.909],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 495bf89496a96eff0b2c5b6a95aa29df8d7fbc81
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 18:57:06 2014 +

sna: Apply drawable offsets to partial CPU damage being replaced

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1fbbddc..aecae51 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2424,6 +2424,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv-cpu_bo  !priv-cpu_bo-flush 
__kgem_bo_is_busy(sna-kgem, priv-cpu_bo)) {
if (!region_subsumes_pixmap(region, pixmap)) {
+   if (get_drawable_deltas(drawable, pixmap, dx, 
dy))
+   RegionTranslate(region, dx, dy);
+
sna_damage_subtract(priv-cpu_damage, region);
if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | 
MOVE_ASYNC_HINT)) {
sna_pixmap_free_cpu(sna, priv, false);

commit 2ba8d40bf7e4d3e8fa541c001f82aa65f26bed3a
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:

xserver-xorg-video-intel: Changes to 'ubuntu'

2014-02-01 Thread Timo Aaltonen

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80c7eadd63aab143680264b906c0360e2bb23a04
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:11:42 2014 +0200

close a bug

diff --git a/debian/changelog b/debian/changelog
index 0c8865d..8893a6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  * New upstream prerelease.
+  * New upstream prerelease. (LP: #1272338)
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300
 


-- 
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/e1w9rdv-0005g7...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'debian-experimental'

2014-02-01 Thread Timo Aaltonen

 NEWS   |   73 +
 configure.ac   |   23 +
 debian/changelog   |6 
 src/intel_device.c |4 
 src/intel_module.c |8 
 src/sna/fb/fb.h|5 
 src/sna/fb/fbpush.c|2 
 src/sna/gen2_render.c  |   59 ++--
 src/sna/gen3_render.c  |   50 ++--
 src/sna/gen4_render.c  |  150 
 src/sna/gen4_vertex.c  |2 
 src/sna/gen5_render.c  |   22 +
 src/sna/gen6_render.c  |   24 +
 src/sna/gen7_render.c  |   24 +
 src/sna/gen8_render.c  |   24 +
 src/sna/gen8_vertex.c  |2 
 src/sna/kgem.c |  462 +++--
 src/sna/kgem.h |5 
 src/sna/sna.h  |   28 +-
 src/sna/sna_accel.c|  425 --
 src/sna/sna_blt.c  |   97 ---
 src/sna/sna_composite.c|   13 -
 src/sna/sna_damage.c   |  447 +++
 src/sna/sna_display.c  |  314 +++--
 src/sna/sna_dri.c  |   82 --
 src/sna/sna_driver.c   |   35 ++
 src/sna/sna_glyphs.c   |   21 -
 src/sna/sna_render.c   |5 
 src/sna/sna_render.h   |7 
 src/sna/sna_tiling.c   |2 
 src/sna/sna_trapezoids.c   |6 
 src/sna/sna_trapezoids_boxes.c |   19 -
 src/sna/sna_trapezoids_imprecise.c |   13 -
 src/sna/sna_trapezoids_mono.c  |   38 +--
 src/sna/sna_trapezoids_precise.c   |   13 -
 src/uxa/intel_display.c|   10 
 src/uxa/intel_dri.c|   10 
 src/uxa/intel_glamor.c |   16 +
 src/uxa/intel_glamor.h |4 
 src/uxa/intel_video.c  |   13 -
 tools/virtual.c|   46 +++
 41 files changed, 1626 insertions(+), 983 deletions(-)

New commits:
commit bb9a196da407280b75efcb175f373df3753e3ef4
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:07:26 2014 +0200

bump the version

diff --git a/debian/changelog b/debian/changelog
index 3f4a883..9e4af6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-xserver-xorg-video-intel (2:2.99.907-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  [ Timo Aaltonen ]
-  * New upstream prerelease.
-
-  [ Maarten Lankhorst ]
   * New upstream prerelease.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300

commit 2c4b2ed558bec3b71077fb12cc4e008819fa
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 17:59:29 2014 +

2.99.909 snapshot

diff --git a/NEWS b/NEWS
index 83bf809..63655d3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Snapshot 2.99.909 (2013-02-01)
+==
+Pass the brown paper bag. Ridiculously stupid bug in last minute coding.
+
+  * Add Xv support using glamor acceleration in addition to adaptors
+provided by the UXA backend.
+
+  * Fix overeager discarding of CPU damage
+Regression in 2.99.908 :(
+https://bugs.freedesktop.org/show_bug.cgi?id=74327
+
+
 Snapshot 2.99.908 (2013-01-31)
 ==
 A couple of regressions dashed the hopes that .907 was to be the final
diff --git a/configure.ac b/configure.ac
index 4e93f95..f7a6d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.99.908],
+[2.99.909],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 495bf89496a96eff0b2c5b6a95aa29df8d7fbc81
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat Feb 1 18:57:06 2014 +

sna: Apply drawable offsets to partial CPU damage being replaced

Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 1fbbddc..aecae51 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2424,6 +2424,9 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
priv-cpu_bo  !priv-cpu_bo-flush 
__kgem_bo_is_busy(sna-kgem, priv-cpu_bo)) {
if (!region_subsumes_pixmap(region, pixmap)) {
+   if (get_drawable_deltas(drawable, pixmap, dx, 
dy))
+   RegionTranslate(region, dx, dy);
+
sna_damage_subtract(priv-cpu_damage, region);
if (sna_pixmap_move_to_gpu(pixmap, MOVE_READ | 
MOVE_ASYNC_HINT)) {
sna_pixmap_free_cpu(sna, priv, false);

commit 2ba8d40bf7e4d3e8fa541c001f82aa65f26bed3a
Author: Chris Wilson ch...@chris-wilson.co.uk
Date:   Sat

xserver-xorg-video-intel: Changes to 'ubuntu'

2014-02-01 Thread Timo Aaltonen

 debian/changelog |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 8f46d06fbc9576978076e6ab34018bc744898cd3
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Sun Feb 2 09:13:12 2014 +0200

fix the changelog

diff --git a/debian/changelog b/debian/changelog
index 8893a6b..8dc60ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+xserver-xorg-video-intel (2:2.99.909-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from Debian git. (LP: #1272338)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sun, 02 Feb 2014 09:12:25 +0200
+
 xserver-xorg-video-intel (2:2.99.909-1) UNRELEASED; urgency=low
 
-  * New upstream prerelease. (LP: #1272338)
+  * New upstream prerelease.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Tue, 01 Oct 2013 14:07:22 +0300
 


-- 
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/e1w9rex-00062d...@moszumanska.debian.org

xserver-xorg-video-intel: Changes to 'upstream-experimental'

xserver-xorg-video-intel: Changes to 'ubuntu'

xserver-xorg-video-intel: Changes to 'ubuntu'

xserver-xorg-video-intel: Changes to 'debian-experimental'

xserver-xorg-video-intel: Changes to 'ubuntu'

5 matches

Site Navigation

Mail list logo

Footer information