date:20120619

xserver-xorg-video-nouveau: Changes to 'upstream-unstable'

2012-06-19 Thread Sven Joachim

 configure.ac  |2 -
 src/nouveau_exa.c |   12 ++---
 src/nv10_exa.c|4 +--
 src/nv30_exa.c|6 ++--
 src/nv30_xv_tex.c |2 -
 src/nv40_exa.c|6 ++--
 src/nv40_xv_tex.c |2 -
 src/nv50_accel.h  |   12 -
 src/nvc0_accel.h  |   28 +-
 src/nve0_shader.h |   66 ++
 10 files changed, 63 insertions(+), 77 deletions(-)

New commits:
commit 0d2b414aff634c996e0468bb0df1894d6c28c09e
Author: Ben Skeggs 
Date:   Tue Jun 19 10:12:37 2012 +1000

bump version to 1.0.1

diff --git a/configure.ac b/configure.ac
index cc8732b..af126fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-nouveau],
-[1.0.0],
+[1.0.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-nouveau])
 

commit f84c28c9e6a0079e527655994689cb9c2ba51999
Author: Ben Skeggs 
Date:   Tue Jun 19 09:49:02 2012 +1000

exa: fix remaining signed datatype issues

Wasn't expecting this situation, apparently it happens..

Signed-off-by: Ben Skeggs 

diff --git a/src/nv10_exa.c b/src/nv10_exa.c
index a3f7df3..cb9eb7c 100644
--- a/src/nv10_exa.c
+++ b/src/nv10_exa.c
@@ -594,9 +594,9 @@ PUSH_VTX2s(struct nouveau_pushbuf *push,
   int x1, int y1, int x2, int y2, int dx, int dy)
 {
BEGIN_NV04(push, NV10_3D(VERTEX_TX0_2I), 1);
-   PUSH_DATA (push, (y1 << 16) | x1);
+   PUSH_DATA (push, ((y1 & 0x) << 16) | (x1 & 0x));
BEGIN_NV04(push, NV10_3D(VERTEX_TX1_2I), 1);
-   PUSH_DATA (push, (y2 << 16) | x2);
+   PUSH_DATA (push, ((y2 & 0x) << 16) | (x2 & 0x));
BEGIN_NV04(push, NV10_3D(VERTEX_POS_3F_X), 3);
PUSH_DATAf(push, dx);
PUSH_DATAf(push, dy);
diff --git a/src/nv30_exa.c b/src/nv30_exa.c
index 9be52e5..95509bc 100644
--- a/src/nv30_exa.c
+++ b/src/nv30_exa.c
@@ -545,10 +545,10 @@ PUSH_VTX2s(struct nouveau_pushbuf *push,
   int x1, int y1, int x2, int y2, int dx, int dy)
 {
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(8)), 2);
-   PUSH_DATA (push, (y1 << 16) | x1);
-   PUSH_DATA (push, (y2 << 16) | x2);
+   PUSH_DATA (push, ((y1 & 0x) << 16) | (x1 & 0x));
+   PUSH_DATA (push, ((y2 & 0x) << 16) | (x2 & 0x));
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(0)), 1);
-   PUSH_DATA (push, (dy << 16) | dx);
+   PUSH_DATA (push, ((dy & 0x) << 16) | (dx & 0x));
 }
 
 void
diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
index 33c5602..bf75cfa 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
@@ -167,7 +167,7 @@ NV30StopTexturedVideo(ScrnInfoPtr pScrn, pointer data, Bool 
Exit)
PUSH_DATAf(push, (sx)); PUSH_DATAf(push, (sy));\
PUSH_DATAf(push, (sx)/2.0); PUSH_DATAf(push, (sy)/2.0);\
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(0)), 1);  \
-   PUSH_DATA (push, ((dy)<<16)|(dx)); \
+   PUSH_DATA (push, (((dy)&0x)<<16)|((dx)&0x));   \
 } while(0)
 
 int
diff --git a/src/nv40_exa.c b/src/nv40_exa.c
index ce0d78a..977c855 100644
--- a/src/nv40_exa.c
+++ b/src/nv40_exa.c
@@ -527,10 +527,10 @@ PUSH_VTX2s(struct nouveau_pushbuf *push,
   int x1, int y1, int x2, int y2, int dx, int dy)
 {
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(8)), 2);
-   PUSH_DATA (push, (y1 << 16) | x1);
-   PUSH_DATA (push, (y2 << 16) | x2);
+   PUSH_DATA (push, ((y1 & 0x) << 16) | (x1 & 0x));
+   PUSH_DATA (push, ((y2 & 0x) << 16) | (x2 & 0x));
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(0)), 1);
-   PUSH_DATA (push, (dy << 16) | dx);
+   PUSH_DATA (push, ((dy & 0x) << 16) | (dx & 0x));
 }
 
 void
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
index 9f2e336..79ef1fc 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
@@ -167,7 +167,7 @@ NV40StopTexturedVideo(ScrnInfoPtr pScrn, pointer data, Bool 
Exit)
PUSH_DATAf(push, (sx)); PUSH_DATAf(push, (sy));\
PUSH_DATAf(push, (sx)/2.0); PUSH_DATAf(push, (sy)/2.0);\
BEGIN_NV04(push, NV30_3D(VTX_ATTR_2I(0)), 1);  \
-   PUSH_DATA (push, ((dy)<<16)|(dx)); \
+   PUSH_DATA (push, (((dy)&0x)<<16)|((dx)&0x));   \
 } while(0)
 
 int
diff --git a/src/nv50_accel.h b/src/nv50_accel.h
index 24f0fa8..87c88a3 100644
--- a/src/nv50_accel.h
+++ b/src/nv50_accel.h
@@ -53,20 +53,18 @@ PUSH_VTX1s(struct nouveau_pushbuf *push, float sx, float 
sy, int dx, int dy)
PUSH_DATAf(push, sx);
PUSH_DATAf(push, sy);
BEGIN_NV04(push, NV50_3D(VTX_ATTR_2I(0)), 1);
-   PUSH_DATA (push, (dy << 16) | dx);
+   PUSH_DATA (push, ((dy & 0x) << 16) | (dx & 0x));
 }
 
 static __inline__ void
 PUSH_VTX2s(struct nouveau_pushbuf *push,

xserver-xorg-video-nouveau: Changes to 'debian-unstable'

2012-06-19 Thread Sven Joachim

 ChangeLog |   51 +
 configure.ac  |2 -
 debian/changelog  |4 +--
 debian/rules  |2 -
 src/nouveau_exa.c |   12 ++---
 src/nv10_exa.c|4 +--
 src/nv30_exa.c|6 ++--
 src/nv30_xv_tex.c |2 -
 src/nv40_exa.c|6 ++--
 src/nv40_xv_tex.c |2 -
 src/nv50_accel.h  |   12 -
 src/nvc0_accel.h  |   28 +-
 src/nve0_shader.h |   66 ++
 13 files changed, 117 insertions(+), 80 deletions(-)

New commits:
commit 9488006b049a6e7c7c4c92ce039191307cbe4dfe
Author: Sven Joachim 
Date:   Tue Jun 19 17:15:00 2012 +0200

New upstream release

diff --git a/ChangeLog b/ChangeLog
index 5cd2248..c20438f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+commit 0d2b414aff634c996e0468bb0df1894d6c28c09e
+Author: Ben Skeggs 
+Date:   Tue Jun 19 10:12:37 2012 +1000
+
+bump version to 1.0.1
+
+commit f84c28c9e6a0079e527655994689cb9c2ba51999
+Author: Ben Skeggs 
+Date:   Tue Jun 19 09:49:02 2012 +1000
+
+exa: fix remaining signed datatype issues
+
+Wasn't expecting this situation, apparently it happens..
+
+Signed-off-by: Ben Skeggs 
+
+commit 794141f22179a09ba6b2a094ba72316c298fee8b
+Author: Maarten Maathuis 
+Date:   Tue Jun 19 00:28:59 2012 +0200
+
+exa: fix various issues in transfer bo handling
+
+Thanks to "Christoph Bumiller " for hinting
+at the cause of the memory leak.
+
+Signed-off-by: Maarten Maathuis 
+Signed-off-by: Ben Skeggs 
+
+commit 661d0cf42219a063f8faa0518f3490ddd38209ff
+Author: Christoph Bumiller 
+Date:   Mon Jun 18 17:13:55 2012 +0200
+
+nve0: fix and improve NV12 shader
+
+Only the 1st set of coordinates is valid.
+NVC0 was fixed in 9a3e579f637267b32efc46cfce5d1a36a41323b1.
+
+commit a907efe44177298cb1c42a236aab087c14b71657
+Author: Christoph Bumiller 
+Date:   Mon Jun 18 13:50:27 2012 +0200
+
+nvc0/accel: oops fix method size in previous patch
+
+commit 8805e20bb9c1cfb7477f3eb7def64c5711fc91ea
+Author: Christoph Bumiller 
+Date:   Mon Jun 18 13:41:43 2012 +0200
+
+nvc0/accel: use correct (signed) vertex data type in PUSH_VTX1/2s
+
+Could have kept s16 but decided against mask and shift.
+
 commit 6dbf4ea12600275775123f9f564469454415da55
 Author: Ben Skeggs 
 Date:   Mon Jun 18 13:28:07 2012 +1000
diff --git a/debian/changelog b/debian/changelog
index 70be625..b5663bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-nouveau (1:1.0.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-nouveau (1:1.0.1-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * New upstream snapshot.
-- Bump to 1.0.0 release.
+- Bump to 1.0.1 release.
 - Pick up a firefox tab draw fix for nv50 cards.
 
   [ Sven Joachim ]
diff --git a/debian/rules b/debian/rules
index 13a65b3..9ba69fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ get-orig-source:
git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau 
&& \
cd xf86-video-nouveau && git log > ChangeLog && \
REVISION=$$(git show --pretty=format:"%h" HEAD | head -n1) && cd .. && \
-   PREFIX=xserver-xorg-video-nouveau_1.0.0+git$$(date +%Y%m%d)+$$REVISION 
&& \
+   PREFIX=xserver-xorg-video-nouveau_1.0.1+git$$(date +%Y%m%d)+$$REVISION 
&& \
rm -rf xf86-video-nouveau/.git && \
tar czf $$PREFIX.orig.tar.gz xf86-video-nouveau && \
rm -rf xf86-video-nouveau

commit 0d2b414aff634c996e0468bb0df1894d6c28c09e
Author: Ben Skeggs 
Date:   Tue Jun 19 10:12:37 2012 +1000

bump version to 1.0.1

diff --git a/configure.ac b/configure.ac
index cc8732b..af126fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-nouveau],
-[1.0.0],
+[1.0.1],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-nouveau])
 

commit f84c28c9e6a0079e527655994689cb9c2ba51999
Author: Ben Skeggs 
Date:   Tue Jun 19 09:49:02 2012 +1000

exa: fix remaining signed datatype issues

Wasn't expecting this situation, apparently it happens..

Signed-off-by: Ben Skeggs 

diff --git a/src/nv10_exa.c b/src/nv10_exa.c
index a3f7df3..cb9eb7c 100644
--- a/src/nv10_exa.c
+++ b/src/nv10_exa.c
@@ -594,9 +594,9 @@ PUSH_VTX2s(struct nouveau_pushbuf *push,
   int x1, int y1, int x2, int y2, int dx, int dy)
 {
BEGIN_NV04(push, NV10_3D(VERTEX_TX0_2I), 1);
-   PUSH_DATA (push, (y1 << 16) | x1);
+   PUSH_DATA (push, ((y1 & 0x) << 16) | (x1 & 0x));
BEGIN_NV04(push, NV10_3D(VERTEX_TX1_2I), 1);
-   PUSH_DATA (push, (y2 << 16) | x2);
+   PUSH_DATA (push, ((y2 & 0x) << 16) | (x2 & 0x));
BEGIN_NV04(push, NV10_3D(VERTEX_POS_3F_X), 3);
PUSH_DATAf(push, dx);
PUSH_DATAf(push, dy);
diff --git a/src/nv30_exa.c b/src/nv30_exa.c
index 9be52e5..95509bc 100644
-

Bug#678124: [retitle] Xorg segfaulting on kfreebsd

2012-06-19 Thread Christoph Egger

retitle 678124 Xorg segfaults on kfreebsd
bye

Hi all!

  Sorry for not setting any (sensible) subject in my first mail, fixing
  up.

Regards

Christoph

-- 
9FED 5C6C E206 B70A 5857  70CA 9655 22B9 D49A E731
Debian Developer | Lisp Hacker | CaCert Assurer



-- 
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/87ehpb2s03@hepworth.siccegge.de

Processed (with 5 errors): [retitle] Xorg segfaulting on kfreebsd

2012-06-19 Thread Debian Bug Tracking System

Processing commands for cont...@bugs.debian.org:

> retitle 678124 Xorg segfaults on kfreebsd
Bug #678124 [xserver-xorg-core] none
Changed Bug title to 'Xorg segfaults on kfreebsd' from 'none'
> bye
Unknown command or malformed arguments to command.

> Hi all!
Unknown command or malformed arguments to command.

>   Sorry for not setting any (sensible) subject in my first mail, fixing
Unknown command or malformed arguments to command.

>   up.
Unknown command or malformed arguments to command.

> Regards
Unknown command or malformed arguments to command.

Too many unknown commands, stopping here.

Please contact me if you need assistance.
-- 
678124: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678124
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems


--
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/handler.s.c.134012280418706.transcr...@bugs.debian.org

xserver-xorg-video-nouveau: Changes to 'upstream-unstable'

xserver-xorg-video-nouveau: Changes to 'debian-unstable'

Bug#678124: [retitle] Xorg segfaulting on kfreebsd

Processed (with 5 errors): [retitle] Xorg segfaulting on kfreebsd

4 matches

Site Navigation

Mail list logo

Footer information