Bug#726002: xserver-xorg-video-mga: Dualheading using 1.6.2 segfaults

[Tormod Volden]

On Thu, Oct 17, 2013 at 5:34 AM, Robert Jacobs wrote:
 The right solution is for someone to modernize the 1.9.100 branch
 from six years ago, and give the MGA driver EXA support. But IIRC
 Brice Goglin had a number of problems that showed up in that
 branch. (e.g. debian 457502, 452223, 488762, 443936, 444739, c c c)

Yes, I guess we cannot expect this to happen.

 When I tracked down this bug, I put in conditional execution that
 simply checked whether each function pointer was null and if so
 refused to dereference it. I feel like your conditional compilation
 patch is better, because then whenever upstream finishes ripping out
 XAA bits, the conditional compilation will be removed along with all
 the rest.

 And ideally Cyril's 02-* dualhead patch should go upstream, so
 review of that would be welcome too.

 I'm not certain what meets upstream's standards? It's sitting
 ineffectively at https://bugs.freedesktop.org/show_bug.cgi?id=18472 ;
 I assume the problem is there no real maintainer there to accept it.

 I know it's been getting plenty of in-the-field testing
 though. Getting this segfault fixed upstream probably requires getting
 18472 commited first.

Yes, I think the problem is the lack of a maintainer or someone who
cares. There is no real upstream since no X.org people use this
driver, can test it, or can justify spending time on it. IMO as long
as it doesn't introduce regressions the patch should be applied.
Personally I am not so inclined to apply it and to some degree
implicitly accept the support burden and maintainership since I don't
have the hardware the test, and not enough technical insight to be
deal with it without testing. However if I can collect some
Reviewed-by's and Tested-by's and someone stays around for testing I
could do it.

Tormod


-- 
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/cal-rjfjbyamfhwvwfe991xeeanpu-row8pnzegw1culwu5c...@mail.gmail.com

Bug#726002: xserver-xorg-video-mga: Dualheading using 1.6.2 segfaults

[Tormod Volden]

On Thu, Oct 17, 2013 at 9:43 AM, Robert Jacobs wrote:
 I'm happy to count as a Tested-by, and as far as I can tell the patch
 02_tentatively_unbreak_dual_head.diff looks sane to me. I'm
 unfortunately not very familiar with the Xorg low-level internals to
 do any kind of comparison to any other (if any) more-nearly maintained
 legacy driver.

Great. I contacted the patch author Andy (when I realized the patch
was not originally from Cyril) and I will post the patch for review on
xorg-devel. In the likely event there is no reaction to it, I'll apply
it and even think about a point release. Not sure why /me am doing
this, but I guess this is the beauty of open-source :) and I
appreciate the continued use of old hardware.

 What kind of testing is needed? Just simple HEAD doesn't have obvious
 regressions on my hardware? If so, I did test a very close variant to
 the patch that's in LP 1180986, and it mostly worked, but as I said, I
 got droppings on the second head.

What would be nice, especially if we would consider a point release,
is to have it tested against the latest xserver.

Mouse droppings, is this traces of the mouse pointer not being cleaned
up? Did dual head at one point work for you without such droppings? In
this case testing of older versions (of server and driver) can help to
spot the regression. Anyway, dual head with mouse droppings is better
than no dual head.

Cheers,
Tormod


-- 
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/CAL-rJFLcF7B79UEGR+wUr2z59sd=fr4ievwcs4fswwse_p6...@mail.gmail.com

Bug#726002: xserver-xorg-video-mga: Dualheading using 1.6.2 segfaults

[Tormod Volden]

On Fri, Oct 11, 2013 at 2:25 AM, Robert Jacobs wrote:
 The newest release of xorg removes xaa.h and xaalocal.h (and, indeed all of
 XAA). This means that the driver is built without defining HAVE_XAA_H,
 which in turn fails to compile the line in mga_storm.c:mgaAccelInit that
 ever fills the value of the function pointer RestoreAccelState. Finally,
 because this function pointer is null, in mga_driver.c:MGACrtc2FillStrip,
 it dereferences the null pointer and crashes.

This reminds me that I have a patch for some of this sitting here:
https://bugs.launchpad.net/bugs/1180986
Maybe you can take a look and possibly suggest a better patch. And
ideally Cyril's 02-* dualhead patch should go upstream, so review of
that would be welcome too.

Best regards,
Tormod

 In addition, the other two function pointers in MGACrtc2FillStrip are also
 null. The driver does technically build and run on my G450 with all three
 commented out, but causes mouse droppings on the second head.

 In the function description, it is strongly implied that this is
 compatibility code for the G400, and thus this workaround isn't much
 of one.

 In any case, without *any* functioning acceleration mechanism, the MGA
 driver is unusably slow.

 Best-
  - Robert Jacobs



-- 
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/cal-rjf+ujhttqvkjdeuvvlwhmhojwsfvm1wu3rd2evkbzrr...@mail.gmail.com

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

[Tormod Volden]

 ChangeLog |   29 +
 configure.ac  |2 +-
 debian/changelog  |6 ++
 src/r128_driver.c |2 +-
 src/r128_exa_render.c |2 +-
 src/r128_probe.c  |5 -
 src/r128_video.c  |4 ++--
 7 files changed, 44 insertions(+), 6 deletions(-)

New commits:
commit 0abe69fa44a3ce74f9b0556d67c44f2780f60993
Author: Tormod Volden debian.tor...@gmail.com
Date:   Thu Oct 3 22:37:20 2013 +0200

Update changelogs for new upstream release

diff --git a/ChangeLog b/ChangeLog
index fd4d598..59225ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+commit ccdfcf5c05ccade823c9734212dcb865d8958cbb
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Wed Oct 2 20:36:38 2013 +0200
+
+r128: bump to version 6.9.2
+
+Signed-off-by: Tormod Volden debian.tor...@gmail.com
+
+commit 255cf857af35e4024486cbc2693872d020f09a29
+Author: Connor Behan connor.be...@gmail.com
+Date:   Mon Sep 30 23:24:54 2013 -0700
+
+Specify NULL for the platform probe function
+
+Apparently this has been required by the ABI since server 1.13.
+
+Signed-off-by: Connor Behan connor.be...@gmail.com
+
+commit a98077959a65dfda1db900373969bd08479d3e43
+Author: Connor Behan connor.be...@gmail.com
+Date:   Mon Sep 30 21:12:20 2013 -0700
+
+Minor spacing changes
+
+A log message needed a space added, two source files needed whitespace
+removed.
+
+Signed-off-by: Connor Behan connor.be...@gmail.com
+
 commit aca6aa127f43deeed42c4d3bef8d1e6a735b4c50
 Author: Connor Behan connor.be...@gmail.com
 Date:   Fri Mar 8 01:02:22 2013 -0800
diff --git a/debian/changelog b/debian/changelog
index 1115e42..624dc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-r128 (6.9.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Tormod Volden debian.tor...@gmail.com  Thu, 03 Oct 2013 22:32:00 +0200
+
 xserver-xorg-video-r128 (6.9.1-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]

commit ccdfcf5c05ccade823c9734212dcb865d8958cbb
Author: Tormod Volden debian.tor...@gmail.com
Date:   Wed Oct 2 20:36:38 2013 +0200

r128: bump to version 6.9.2

Signed-off-by: Tormod Volden debian.tor...@gmail.com

diff --git a/configure.ac b/configure.ac
index 38dc9bd..56554ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-[6.9.1],
+[6.9.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-r128])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 255cf857af35e4024486cbc2693872d020f09a29
Author: Connor Behan connor.be...@gmail.com
Date:   Mon Sep 30 23:24:54 2013 -0700

Specify NULL for the platform probe function

Apparently this has been required by the ABI since server 1.13.

Signed-off-by: Connor Behan connor.be...@gmail.com

diff --git a/src/r128_probe.c b/src/r128_probe.c
index 15e4a77..7f1fbda 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -379,6 +379,9 @@ _X_EXPORT DriverRec R128 =
 NULL,
 #ifdef XSERVER_LIBPCIACCESS
 r128_device_match,
-r128_pci_probe
+r128_pci_probe,
+#endif
+#ifdef XSERVER_PLATFORM_BUS
+NULL
 #endif
 };

commit a98077959a65dfda1db900373969bd08479d3e43
Author: Connor Behan connor.be...@gmail.com
Date:   Mon Sep 30 21:12:20 2013 -0700

Minor spacing changes

A log message needed a space added, two source files needed whitespace
removed.

Signed-off-by: Connor Behan connor.be...@gmail.com

diff --git a/src/r128_driver.c b/src/r128_driver.c
index f47c7e3..72d9e3c 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2269,7 +2269,7 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 #ifdef RENDER
 info-RenderAccel = xf86ReturnOptValBool(info-Options, 
OPTION_RENDERACCEL, TRUE);
 if (info-RenderAccel)
-xf86DrvMsg(pScrn-scrnIndex, X_INFO, Acceleration of RENDER 
operations will be enabled
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Acceleration of RENDER 
operations will be enabled 
 upon successful loading of DRI 
and EXA\n);
 #endif
 #endif
diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c
index f31bdf3..f00536e 100644
--- a/src/r128_exa_render.c
+++ b/src/r128_exa_render.c
@@ -102,7 +102,7 @@ R128SolidPixmap(ScreenPtr pScreen, uint32_t solid)
return NULL;
 }
 info-ExaDriver-WaitMarker(pScreen, 0);
-
+
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 if (pScrn-bitsPerPixel == 32)
R128CopySwap(info-ExaDriver-memoryBase + exaGetPixmapOffset(pPix), 
(uint8_t*)solid, 4,
diff --git a/src/r128_video.c b/src/r128_video.c
index bb5a655..dccaa42 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -673,7 +673,7 @@ R128DisplayVideo422(
 v_inc_shift++;
 if (pScrn-currentMode-Flags  V_DBLSCAN)
 v_inc_shift--;
-
+
 rmx_active = INREG(R128_FP_VERT_STRETCH

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

[Tormod Volden]

 configure.ac  |2 +-
 src/r128_driver.c |2 +-
 src/r128_exa_render.c |2 +-
 src/r128_probe.c  |5 -
 src/r128_video.c  |4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ccdfcf5c05ccade823c9734212dcb865d8958cbb
Author: Tormod Volden debian.tor...@gmail.com
Date:   Wed Oct 2 20:36:38 2013 +0200

r128: bump to version 6.9.2

Signed-off-by: Tormod Volden debian.tor...@gmail.com

diff --git a/configure.ac b/configure.ac
index 38dc9bd..56554ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-[6.9.1],
+[6.9.2],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-r128])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 255cf857af35e4024486cbc2693872d020f09a29
Author: Connor Behan connor.be...@gmail.com
Date:   Mon Sep 30 23:24:54 2013 -0700

Specify NULL for the platform probe function

Apparently this has been required by the ABI since server 1.13.

Signed-off-by: Connor Behan connor.be...@gmail.com

diff --git a/src/r128_probe.c b/src/r128_probe.c
index 15e4a77..7f1fbda 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -379,6 +379,9 @@ _X_EXPORT DriverRec R128 =
 NULL,
 #ifdef XSERVER_LIBPCIACCESS
 r128_device_match,
-r128_pci_probe
+r128_pci_probe,
+#endif
+#ifdef XSERVER_PLATFORM_BUS
+NULL
 #endif
 };

commit a98077959a65dfda1db900373969bd08479d3e43
Author: Connor Behan connor.be...@gmail.com
Date:   Mon Sep 30 21:12:20 2013 -0700

Minor spacing changes

A log message needed a space added, two source files needed whitespace
removed.

Signed-off-by: Connor Behan connor.be...@gmail.com

diff --git a/src/r128_driver.c b/src/r128_driver.c
index f47c7e3..72d9e3c 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2269,7 +2269,7 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 #ifdef RENDER
 info-RenderAccel = xf86ReturnOptValBool(info-Options, 
OPTION_RENDERACCEL, TRUE);
 if (info-RenderAccel)
-xf86DrvMsg(pScrn-scrnIndex, X_INFO, Acceleration of RENDER 
operations will be enabled
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Acceleration of RENDER 
operations will be enabled 
 upon successful loading of DRI 
and EXA\n);
 #endif
 #endif
diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c
index f31bdf3..f00536e 100644
--- a/src/r128_exa_render.c
+++ b/src/r128_exa_render.c
@@ -102,7 +102,7 @@ R128SolidPixmap(ScreenPtr pScreen, uint32_t solid)
return NULL;
 }
 info-ExaDriver-WaitMarker(pScreen, 0);
-
+
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 if (pScrn-bitsPerPixel == 32)
R128CopySwap(info-ExaDriver-memoryBase + exaGetPixmapOffset(pPix), 
(uint8_t*)solid, 4,
diff --git a/src/r128_video.c b/src/r128_video.c
index bb5a655..dccaa42 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -673,7 +673,7 @@ R128DisplayVideo422(
 v_inc_shift++;
 if (pScrn-currentMode-Flags  V_DBLSCAN)
 v_inc_shift--;
-
+
 rmx_active = INREG(R128_FP_VERT_STRETCH)  R128_VERT_STRETCH_ENABLE;
 if (rmx_active) {
 v_inc = ((src_h * pScrn-currentMode-CrtcVDisplay / info-PanelYRes) 
 v_inc_shift) / drw_h;
@@ -757,7 +757,7 @@ R128DisplayVideo420(
 v_inc_shift++;
 if (pScrn-currentMode-Flags  V_DBLSCAN)
 v_inc_shift--;
-
+
 rmx_active = INREG(R128_FP_VERT_STRETCH)  R128_VERT_STRETCH_ENABLE;
 if (rmx_active) {
 v_inc = ((src_h * pScrn-currentMode-CrtcVDisplay / info-PanelYRes) 
 v_inc_shift) / drw_h;


-- 
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/e1vrpmr-0003f6...@vasks.debian.org

intel-gpu-tools 1.3

[Tormod Volden]

Hi,

Timo prepared intel-gpu-tools 1.3-1 in git a long time ago. It has
been used in Ubuntu since then, so I guess it is pretty well tested.
Can somebody please release this to unstable?

I can take a stab at packaging 1.4 soon but meanwhile 1.3 would be a
blessing to users stuck at 1.2. Maybe it even fixes the current RC
bug.

Best regards,
Tormod

http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/intel-gpu-tools.git


-- 
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/cal-rjfj3eiq8r06prh10p0hy+3ofoe59_ehrfhtpohkuxpc...@mail.gmail.com

Bug#715278:

[Tormod Volden]

On Tue, Sep 3, 2013 at 4:24 AM, Brandon Simmons wrote:
 Is anyone maintaining this package? What can I do to help?


Hi Brandon,

The Debian intel-gpu-tools packaging is maintained at
http://git.debian.org/?p=pkg-xorg/app/intel-gpu-tools.git
If you can provide patches against this tree it would be very welcome.

Tormod


-- 
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/cal-rjflpzgyqtowno5oywmv66x9fac_4jjctcd3kf+ebluu...@mail.gmail.com

Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1

[Tormod Volden]

On Tue, May 8, 2012 at 2:57 AM, Stefan Lippers-Hollmann wrote:
 Hi

 On Tuesday 08 May 2012, Tormod Volden wrote:
 On Mon, May 7, 2012 at 9:08 AM, Tormod Volden wrote:
  On Mon, May 7, 2012 at 2:02 AM, Cyril Brulebois wrote:
  Hi Stefan,
 
  Stefan Lippers-Hollmann (07/05/2012):
  Backtrace:
  0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919]
  1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a]
  2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410]
 
  Segmentation fault at address (nil)

 From the previous entries in the Xorg.0.log before the crash it looks
 like it crashes in the vgaHW* functions.

Thanks for the debugging. But sorry for wasting your time, the driver
simply needs an update. I did not realize before now how outdated the
Debian version is. I was looking at newer code when trying to analyze
the problem :( . I will make a new package in a few days (again,
unless someone beats me to it...).

Tormod



-- 
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/cal-rjf+xcj39cx6-+ek+1w_1xu6yhtikf9e7c+0ohwytenj...@mail.gmail.com

Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1

[Tormod Volden]

On Mon, May 7, 2012 at 2:02 AM, Cyril Brulebois k...@debian.org wrote:
 Hi Stefan,

 Stefan Lippers-Hollmann s@gmx.de (07/05/2012):
 Backtrace:
 0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919]
 1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a]
 2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410]

 Segmentation fault at address (nil)

 hmm, doesn't look too helpful. Does gdb help? Starters' doc available at:
  http://x.debian.net/howto/use-gdb.html

 FWIW, new xorg-server should fly to unstable in a few minutes; you may
 want to try and reproduce with that one.

Wow, a savage user! I am hoping to get a newer savage version done
soon, unless someone beats me to it. Anyway, this issue might be
outside the driver. Do you have libpciaccess 13.1? This is in my
experience necessary in order to run xserver 1.12.

Tormod



--
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/cal-rjf+ccwznd4j5xhihuox5unzhiwsnn-zn4eyfdxzvymc...@mail.gmail.com

Bug#671800: xserver-xorg-video-savage: segfaults under X.Org X Server 1.12.1

[Tormod Volden]

On Mon, May 7, 2012 at 9:08 AM, Tormod Volden wrote:
 On Mon, May 7, 2012 at 2:02 AM, Cyril Brulebois wrote:
 Hi Stefan,

 Stefan Lippers-Hollmann (07/05/2012):
 Backtrace:
 0: /usr/bin/X (xorg_backtrace+0x49) [0xb76bb919]
 1: /usr/bin/X (0xb7533000+0x18c38a) [0xb76bf38a]
 2: (vdso) (__kernel_rt_sigreturn+0x0) [0xb7515410]

 Segmentation fault at address (nil)

From the previous entries in the Xorg.0.log before the crash it looks
like it crashes in the vgaHW* functions.


 hmm, doesn't look too helpful. Does gdb help? Starters' doc available at:
  http://x.debian.net/howto/use-gdb.html

Please install xserver-xorg-core-dbg package at least, and see if we
can get a more meaningful backtrace. A bt full full backtrace from
gdb would be great.

Tormod



--
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/cal-rjfl0qsg1og5b9tiq50dzkqyxebj-xagb1rqdgvjmjw7...@mail.gmail.com

Bug#622606: xserver-xorg-video-r128: [regression] [powerpc] X dies with SIGBUS if I tell it UseFBDev false

[Tormod Volden]

Rogério and James,

Would you be willing to test this patch:
http://alioth.debian.org/~tormod-guest/0001-Do-not-use-VBE-on-powerpc-in-R128ProbeDDC.patch

It should avoid the SIGBUS error when running without an xorg.conf or
with -configure. It does not change much more, but my hope is that X
will start and fall back to some low screen resolution instead of
simply crashing.

Thanks in advance,
Tormod



--
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/cal-rjf+fdzfw5nia6yuhvaffexp7ojk3hdd_i7eugfnb58s...@mail.gmail.com

intel-gpu-tools 1.2

[Tormod Volden]

Hi,
Is there any DD around that would like to review and sponsor my
packaging of intel-gpu-tools 1.2?

http://anonscm.debian.org/gitweb/?p=users/tormod-guest/intel-gpu-tools.git;a=summary

Also uploaded sources to:
http://alioth.debian.org/~tormod-guest/intel-gpu-tools/

Cheers,
Tormod


-- 
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/cal-rjfl15h9yy6bqng8dx2wk1q3ztcsuj2ecxoe+wvvbdpg...@mail.gmail.com

Re: intel-gpu-tools 1.2

[Tormod Volden]

On Tue, Feb 28, 2012 at 9:52 PM, Tormod Volden debian.tor...@gmail.com wrote:
 Hi,
 Is there any DD around that would like to review and sponsor my
 packaging of intel-gpu-tools 1.2?

 http://anonscm.debian.org/gitweb/?p=users/tormod-guest/intel-gpu-tools.git;a=summary

 Also uploaded sources to:
 http://alioth.debian.org/~tormod-guest/intel-gpu-tools/

Meanwhile I got some very helpful comments from Bryce (thanks!), and
fixed up accordingly. I rebased my own git tree and moved my old
source packages away.

Tormod


-- 
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/CAL-rJF+3rHXqbWwmT=MQMq2rBngDDYDMdOo-xhZ5=223vrc...@mail.gmail.com

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

[Tormod Volden]

 .gitignore |  154 -
 COPYING|  108 +
 Makefile.am|   20 
 autogen.sh |   14 
 benchmarks/.gitignore  |5 
 benchmarks/Makefile.am |   29 
 configure.ac   |  130 -
 debugger/.gitignore|2 
 debugger/Makefile.am   |   27 
 debugger/system_routine/.gitignore |   10 
 debugger/system_routine/GNUmakefile.in |3 
 debugger/system_routine/Makefile   |   84 
 debugger/system_routine/Makefile.am|   42 
 demos/.gitignore   |1 
 demos/Makefile.am  |7 
 demos/sprite_on.c  | 1222 +
 lib/Makefile.am|   51 
 lib/drmtest.c  |  306 +++
 lib/drmtest.h  |   31 
 lib/gen6_render.h  | 1553 +
 lib/intel_batchbuffer.h|1 
 lib/intel_drm.c|   99 +
 lib/intel_gpu_tools.h  |1 
 lib/intel_mmio.c   |   32 
 lib/intel_pci.c|   14 
 lib/intel_reg.h|   17 
 lib/intel_reg_map.c|5 
 lib/rendercopy.h   |   72 
 lib/rendercopy_gen6.c  |  599 ++
 lib/rendercopy_i830.c  |  344 +++
 lib/rendercopy_i915.c  |  180 ++
 m4/.gitignore  |5 
 man/Makefile.am|   44 
 man/intel_audio_dump.1 |   11 
 man/intel_audio_dump.man   |   11 
 man/intel_bios_dumper.1|   14 
 man/intel_bios_dumper.man  |   14 
 man/intel_bios_reader.1|   15 
 man/intel_bios_reader.man  |   15 
 man/intel_error_decode.1   |   20 
 man/intel_error_decode.man |   20 
 man/intel_gpu_top.1|   41 
 man/intel_gpu_top.man  |   41 
 man/intel_gtt.1|   14 
 man/intel_gtt.man  |   14 
 man/intel_lid.1|   12 
 man/intel_lid.man  |   12 
 man/intel_reg_dumper.1 |   24 
 man/intel_reg_dumper.man   |   24 
 man/intel_reg_read.1   |   15 
 man/intel_reg_read.man |   15 
 man/intel_reg_snapshot.1   |   15 
 man/intel_reg_snapshot.man |   15 
 man/intel_reg_write.1  |   16 
 man/intel_reg_write.man|   16 
 man/intel_stepping.1   |   15 
 man/intel_stepping.man |   15 
 man/intel_upload_blit_large.1  |   18 
 man/intel_upload_blit_large.man|   18 
 man/intel_upload_blit_large_gtt.1  |   18 
 man/intel_upload_blit_large_gtt.man|   18 
 man/intel_upload_blit_large_map.1  |   18 
 man/intel_upload_blit_large_map.man|   18 
 man/intel_upload_blit_small.1  |   18 
 man/intel_upload_blit_small.man|   18 
 scripts/Makefile.am|7 
 tests/.gitignore   |   57 
 tests/Makefile.am  |   34 
 tests/ZZ_check_dmesg   |   11 
 tests/ZZ_hangman   |   62 
 tests/drm_vma_limiter.c|  110 +
 tests/drm_vma_limiter_cached.c |  138 +
 tests/drm_vma_limiter_cpu.c|  100 +
 tests/drm_vma_limiter_gtt.c|  101 +
 tests/gem_bad_length.c |   32 
 tests/gem_basic.c  |   10 
 tests/gem_cs_prefetch.c|  169 +
 tests/gem_exec_bad_domains.c   |   10 
 tests/gem_exec_blt.c   |   43 
 tests/gem_exec_faulting_reloc.c|   59 
 tests/gem_exec_nop.c   |   63 
 tests/gem_fence_thrash.c   |   12 
 tests/gem_fenced_exec_thrash.c |   44 
 tests/gem_flink.c  |   14 
 tests/gem_gtt_speed.c  |  104 -
 tests/gem_largeobject.c|   23 
 tests/gem_linear_blits.c   |   66 
 tests/gem_mmap.c   |   39 
 tests/gem_mmap_gtt.c   |   76 
 tests/gem_partial_pwrite_pread.c   |   53 
 tests/gem_pwrite.c |   32 
 tests/gem_reloc_vs_gpu.c   |1 
 tests/gem_ring_sync_loop.c |4 
 tests/gem_stress.c |  181 --
 tests/gem_stress.h |  100 -
 tests/gem_stress_gen6.c|  595 --
 tests/gem_stress_i830.c|  354 ---
 tests/gem_stress_i915.c|  190 --
 tests/gem_tiled_blits.c|   10 
 tests/gem_tiled_fence_blits.c  |   42 
 tests/gem_tiled_pread.c|   61 
 tests/gem_tiled_pread_pwrite.c |   76 
 tests/gem_tiled_swapping.c

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

[Tormod Volden]

/gem_tiled_fence_blits.c  |   42 
 tests/gem_tiled_pread.c|   61 
 tests/gem_tiled_pread_pwrite.c |   76 
 tests/gem_tiled_swapping.c |  145 +
 tests/gem_vmap_blits.c |   62 
 tests/gen3_mixed_blits.c   |   88 
 tests/gen3_render_linear_blits.c   |   66 
 tests/gen3_render_mixed_blits.c|   86 
 tests/gen3_render_tiledx_blits.c   |   86 
 tests/gen3_render_tiledy_blits.c   |   86 
 tests/gen6_render.h| 1553 -
 tests/testdisplay.c|  291 +--
 tests/testdisplay.h|   35 
 tests/testdisplay_hotplug.c|  136 +
 tools/.gitignore   |   20 
 tools/Makefile.am  |   83 
 tools/intel_audio_dump.c   |  381 +++-
 tools/intel_bios_dumper.c  |   20 
 tools/intel_bios_reader.c  |  103 -
 tools/intel_decode.c   | 2931 -
 tools/intel_decode.h   |   35 
 tools/intel_dump_decode.c  |   32 
 tools/intel_error_decode.c |   52 
 tools/intel_gpu_top.c  |   16 
 tools/intel_gtt.c  |1 
 tools/intel_reg_dumper.c   |  248 +-
 tools/intel_reg_read.c |4 
 tools/intel_reg_write.c|3 
 tools/intel_stepping.c |   24 
 131 files changed, 8390 insertions(+), 8323 deletions(-)

New commits:
commit 20b48893a9181bf250a1a23c7de385646be8c13c
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sat Feb 11 13:57:02 2012 +0100

Add build-deps for now non-optional testdisplay

diff --git a/debian/changelog b/debian/changelog
index d4d8e31..1bb47a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 intel-gpu-tools (1.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Add cairo/glib/udev devel libs to build-deps for testdisplay
 
  -- Tormod Volden debian.tor...@gmail.com  Sun, 12 Feb 2012 22:50:29 +0100
 
diff --git a/debian/control b/debian/control
index 3c8111b..6ba162d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,9 @@ Build-Depends:
  libdrm-dev,
  libdrm-intel1 (= 2.4.23),
  xutils-dev (= 1:7.6+6),
+ libcairo2-dev,
+ libudev-dev,
+ libglib2.0-dev,
 Standards-Version: 3.9.2
 Homepage: http://www.intellinuxgraphics.org/
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/intel-gpu-tools.git

commit eec2e8f1211c90ca4b11476d4eaa08ce8307182a
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Feb 12 22:53:29 2012 +0100

Bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 6480e1b..c9a5c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1256 @@
+commit 2065ca15fb5a5a5c4079f6c0cb6361a4052e4fdb
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Thu Feb 9 22:39:50 2012 +0100
+
+Release 1.2
+
+commit 06bfa3d3870521a595beb280f5f91c07422f189e
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Thu Feb 9 22:32:54 2012 +0100
+
+lib/rendercopy: fixup make distcheck
+
+And complete the gem_stress-rendercopy rename that I've forgotten
+about.
+
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit 042f40eda776aec56c4d39d4e47033117a85415e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Feb 8 17:04:45 2012 -0800
+
+Fix program name in intel_bios_dumper.man SYNOPSIS
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 90a6f75dd284e4527e6583a519da5b634f8b469d
+Author: Kenneth Graunke kenn...@whitecape.org
+Date:   Wed Feb 8 12:05:05 2012 -0800
+
+Update generation checks to provide basic support for Ivybridge.
+
+There may be some updates required, but assuming Ivybridge is similar to
+Sandybridge is a decent start; previously it fell through to the Gen2/3
+case and nothing worked.
+
+Signed-off-by: Kenneth Graunke kenn...@whitecape.org
+Reviewed-by: Ben Widawsky b...@bwidawsk.net
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit 6fe3884bc97b7c9ad5cdcbc9144cb7319341eb75
+Author: Daniel Vetter daniel.vet...@ffwll.ch
+Date:   Wed Feb 8 16:46:57 2012 +0100
+
+add sprite demo from Armin Reese
+
+Also fixed up the copyright header a bit. No comments on the coding
+styled used ;-)
+
+Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
+
+commit e61b917134527500c08900f5f71d996a9cbc5735
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Feb 4 09:05:08 2012 -0800
+
+Move free(cmd) to after last use of cmd in intel_gpu_top
+
+Error: Use after free (CWE 416)
+   Use after free of pointer 'cmd' in call to fprintf
+at line 496 of tools/intel_gpu_top.c in function 'main'.
+  Previously freed at line 491 with free.
+[ This bug was found by the Parfait 0.4.2 bug checking tool.
+  For more information see http://labs.oracle.com/projects/parfait/ ]
+
+Signed

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

[Tormod Volden]

 debian/changelog|   15 +++-
 debian/control  |4 ++
 debian/patches/100_drmtest_exit_not_abort.patch |   43 
 debian/patches/series   |1 
 debian/rules|5 ++
 5 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit 48fbf939b52594799433f6fa6469dbd08c559f18
Author: Tormod Volden debian.tor...@gmail.com
Date:   Fri Feb 10 22:33:43 2012 +0100

Add Vcs links to debian/control

diff --git a/debian/changelog b/debian/changelog
index e954603..5036258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
 Tormod, and myself as Uploaders.
   * Wrap Build-Depends/Depends.
   * Bump libdrm-intel1 build-dep.
-  * Bump Standards-Version to 3.9.2 (no changes needed)
   * Update watch file:
 - Add a reference to upstream git repository.
 - Switch from tar.bz2 to tar.gz, the former isn't supported by the 1.0
@@ -27,6 +26,10 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
   * Add 100_drmtest_exit_not_abort.patch to avoid SIGABRT when running
 benchmarks as non-root.
 
+  [ Tormod Volden ]
+  * control: Add Vcs links
+  * Bump Standards-Version to 3.9.2 (no changes needed)
+
  -- Cyril Brulebois k...@debian.org  Sun, 25 Dec 2011 18:16:47 +0100
 
 intel-gpu-tools (1.0.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ab4d94c..3c8111b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends:
  xutils-dev (= 1:7.6+6),
 Standards-Version: 3.9.2
 Homepage: http://www.intellinuxgraphics.org/
+Vcs-Git: git://git.debian.org/git/pkg-xorg/app/intel-gpu-tools.git
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/intel-gpu-tools.git
 
 Package: intel-gpu-tools
 Architecture: any

commit bb2be94945e8365cf3ca0c3fc290f7f5f15eecc3
Author: Tormod Volden debian.tor...@gmail.com
Date:   Fri Feb 10 22:23:08 2012 +0100

Add patch to avoid SIGABRT when running non-root

Picked from Bryce's ubuntu branch, thanks.

diff --git a/debian/changelog b/debian/changelog
index d6e40e0..e954603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
   * Add build dependency on xutils-dev to fix FTBFS.
   * rules: Add gentarball target to make it easier to update to new git
 snapshots when needed.
+  * Add 100_drmtest_exit_not_abort.patch to avoid SIGABRT when running
+benchmarks as non-root.
 
  -- Cyril Brulebois k...@debian.org  Sun, 25 Dec 2011 18:16:47 +0100
 
diff --git a/debian/patches/100_drmtest_exit_not_abort.patch 
b/debian/patches/100_drmtest_exit_not_abort.patch
new file mode 100644
index 000..d539393
--- /dev/null
+++ b/debian/patches/100_drmtest_exit_not_abort.patch
@@ -0,0 +1,43 @@
+From 73af5dcd1d361543a79189456e66b951bc4c9cb3 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington br...@canonical.com
+Date: Tue, 24 Jan 2012 19:35:28 -0800
+Subject: [PATCH intel-gpu-tools 1/1] drmtest:  exit() rather than abort() for 
simple usage errors.
+
+When the benchmarks are run as non-root, they terminate since they can't
+read the drm files.  However, by terminating with abort(), this raises
+SIGABRT which has the side effect of triggering crash reporting
+utilities (e.g. apport).  As a result we've been accumulating bug
+reports about it.
+
+As the code is displaying a unique error message prior to termination,
+it should be discoverable enough where in the code the failure occurs,
+so an exit(1) should be sufficient for termination.
+
+Signed-off-by: Bryce Harrington br...@canonical.com
+---
+ lib/drmtest.c |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/drmtest.c b/lib/drmtest.c
+index fc40ad1..5ebd6d6 100644
+--- a/lib/drmtest.c
 b/lib/drmtest.c
+@@ -65,7 +65,7 @@ int drm_open_any(void)
+   close(fd);
+   }
+   fprintf(stderr, failed to open any drm device. retry as root?\n);
+-  abort();
++  exit(1);
+ }
+ 
+ 
+@@ -108,5 +108,5 @@ int drm_open_any_master(void)
+   return fd;
+   }
+   fprintf(stderr, Couldn't find an un-controlled DRM device\n);
+-  abort();
++  exit(1);
+ }
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..069dcea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+100_drmtest_exit_not_abort.patch

commit 7db0f8ba9ee8ac5ab5ddc3cbb12cbbdde0d45500
Author: Tormod Volden debian.tor...@gmail.com
Date:   Fri Feb 10 22:08:13 2012 +0100

Add gentarball rule (for future convenience)

Picked from Bryce's ubuntu branch, thanks.

diff --git a/debian/changelog b/debian/changelog
index 7da57a4..d6e40e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
   * control: Add Conflicts with xserver-xorg-video-intel

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

[Tormod Volden]

 debian/changelog   |2 +-
 debian/intel-gpu-tools.install |2 ++
 debian/rules   |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5033a0ac38e80f1343c523c35e294a4d83210678
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Jan 16 23:39:09 2012 +0100

Clarify why the test suite is disabled.

diff --git a/debian/changelog b/debian/changelog
index a5bb1a4..06ead44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
 - Switch debhelper build-dep and compat to 8.
 - Use dh-autoreconf and quilt as in other X packages.
 - Use --fail-missing and .install accordingly.
-  * Disable test suite: it needs to be run as root.
+  * Disable test suite, make test checks GPU/drm, not the build
 
  -- Cyril Brulebois k...@debian.org  Sun, 25 Dec 2011 18:16:47 +0100
 
diff --git a/debian/rules b/debian/rules
index 30b44fb..6d954b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 # Disable test suite:
 override_dh_auto_test:
-   echo 'Test suite disabled: it needs to be run as root, with no X 
running.'
+   echo 'Test suite disabled (does not perform a build check).'
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:

commit 20276c99aca771645ce0195812971e10218aa408
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Jan 16 23:33:29 2012 +0100

Add missing debian/intel-gpu-tools.install

diff --git a/debian/intel-gpu-tools.install b/debian/intel-gpu-tools.install
new file mode 100644
index 000..a65408f
--- /dev/null
+++ b/debian/intel-gpu-tools.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man


-- 
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/e1rngqn-0004jm...@vasks.debian.org

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

[Tormod Volden]

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

New commits:
commit 6c6614394b414035583c5015a96cc9914bee6344
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Jan 16 19:05:12 2012 +0100

Add bug closers.

diff --git a/debian/changelog b/debian/changelog
index d22be96..fa1a81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream release. (Closes: #621721)
+- Fixes intel_gpu_top MMIO issue. (Closes: #655672)
   * Make the Debian X Strike Force maintain the package; keeping Eric,
 Tormod, and myself as Uploaders.
   * Wrap Build-Depends/Depends.


-- 
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/e1rmr5q-0005fq...@vasks.debian.org

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

[Tormod Volden]

 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c30aa3cfc0b6005ce71a774bba02051da16518be
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Jan 16 20:56:23 2012 +0100

Bump standards-version to 3.9.2

diff --git a/debian/changelog b/debian/changelog
index fa1a81d..a5bb1a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low
 Tormod, and myself as Uploaders.
   * Wrap Build-Depends/Depends.
   * Bump libdrm-intel1 build-dep.
+  * Bump Standards-Version to 3.9.2 (no changes needed)
   * Update watch file:
 - Add a reference to upstream git repository.
 - Switch from tar.bz2 to tar.gz, the former isn't supported by the 1.0
diff --git a/debian/control b/debian/control
index 9ffc643..44c3950 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libpciaccess-dev (= 0.10),
  libdrm-dev,
  libdrm-intel1 (= 2.4.23),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Homepage: http://www.intellinuxgraphics.org/
 
 Package: intel-gpu-tools


-- 
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/e1rmsfy-00039i...@vasks.debian.org

Re: [Intel-gfx] [ANNOUNCE] intel-gpu-tools 1.1

[Tormod Volden]

On Sun, Dec 25, 2011 at 6:16 PM, Cyril Brulebois k...@debian.org wrote:
 [resent with correct address for debian-x@. been busy with lists.x.org a
 bit too much lately…]

 Daniel Vetter daniel.vet...@ffwll.ch (24/12/2011):
 A bit early for a Xmas gift but way too late for a release, I've finally
 managed to shove out a new intel-gpu-tools version. Too much stuff to list
 here, and mostly only interesting for developers (who use the latest git
 version anyway).

 Tormod, I picked the 1.0.1-1 and 1.0.2-1 tag in your collab-maint
 repository and used that to create a “usual” pkg-xorg repository with
 upstream-* and debian-*. Building a source package for 1.0.2-1 and
 debdiffing against what's in the archive only shows autogen.sh so I'd
 say we're set. I'll try and prepare 1.1-1 soonish, and push that to
 /pkg-xorg/app/intel-gpu-tools.git; reviews are welcome.

 Mraw,
 KiBi.

Oh, an intel-gpu-tools release this decade :)
Yes, moving it to pkg-xorg and pkg-xorg'ishing the repo sounds good to
me. Will take a look.

Cheers,
Tormod


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

revive and move s3switch to pkg-xorg

[Tormod Volden]

Hi,
s3switch is a tool to manipulate video outputs on S3 Savage cards. I
have picked up the upstream maintenance, and with the help of the last
Debian maintainer Guido Günther I will bring the Debian package back
to life also. I would like to maintain it in pkg-xorg. Should I set up
the git tree under /git/pkg-xorg/app/ or does anyone have other
suggestions?

For anyone interested I put it temporarily at
http://anonscm.debian.org/gitweb/?p=users/tormod-guest/s3switch.git;a=summary
BTW, the upstream release is ready but I am awaiting some testing
before making it official.

Cheers,
Tormod

Note to self: Update debian/control with Vcs-* links.


--
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/CAL-rJFJFvYURf0+AeFFxyfCjm0UX8FJQt+gM8D=el+pmukr...@mail.gmail.com

Re: revive and move s3switch to pkg-xorg

[Tormod Volden]

On Sat, Nov 19, 2011 at 8:38 PM, Julien Cristau jcris...@debian.org wrote:
 On Sat, Nov 19, 2011 at 19:41:10 +0100, Tormod Volden wrote:

 Hi,
 s3switch is a tool to manipulate video outputs on S3 Savage cards. I
 have picked up the upstream maintenance, and with the help of the last
 Debian maintainer Guido Günther I will bring the Debian package back
 to life also. I would like to maintain it in pkg-xorg. Should I set up
 the git tree under /git/pkg-xorg/app/ or does anyone have other
 suggestions?

 If it's going to live under fdo/xorg upstream that seems ok to me.

I haven't got any feedback from xorg-devel@ since I asked about this,
but IMO that is where it belongs. For now it is in
http://cgit.freedesktop.org/~tormod/s3switch

Cheers,
Tormod


 Thanks for your work.

 Cheers,
 Julien



--
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/CAL-rJFK_yapzAJB5d_WT=ob2c7cm02es4u9zasut0pntwrz...@mail.gmail.com

Bug#499228: xserver-xorg-video-savage: DPMS turns off LCD but not backlight

[Tormod Volden]

I can not reproduce this. Is this still an issue for you?

Regards,
Tormod



-- 
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/CAL-rJF+95vyjVfnGf5On0siuEV69eTQ1ujXjBG2PFAA=poj...@mail.gmail.com

Re: new -savage and -mga packages needs sponsoring

[Tormod Volden]

On Sun, Oct 23, 2011 at 5:42 PM, Julien Cristau jcris...@debian.org wrote:
 I notice we still carry a patch for savage, and some changelog digging
 shows it originate from:

 xorg (6.8.2-71) breezy; urgency=low

  * Force 16 bit depth on savage driver.
  (Closes: #15718)

 xorg (6.8.2-1) hoary; urgency=low

  * Change the default bitdepth on Savage to 24 (closes: Ubuntu#6127).

 Both from 2005.  I'm wondering if we shouldn't either include that
 upstream or drop the patch?  (I imagine these bug numbers come from the
 long-gone ubuntu bugzilla...)

Actually the old URL http://bugzilla.ubuntu.com/show_bug.cgi?id=...
redirects properly :) So here are those bugs in LP:
https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/12500
https://bugs.launchpad.net/ubuntu/+source/xorg/+bug/21933

Seems like one of the issues with 24 bit (CLUT left in 6 bit) was
fixed so default was set to 24 bit again in 2005, but there was enough
issues to put the 16 bit back later. Also, DRI is faster with 16 bit.

Yes, I have been thinking of upstreaming this patch. Ubuntu also has a
patch to set bus type by default to PCI instead of AGP, not sure which
hardware still needs this. It is a bit tricky to change any defaults
for this old, fairly rare hardware since people have learned to live
with necessary workarounds and we might create regressions for some
people. I will try to see if Fedora and Mandriva etc carry any
patches.

Cheers,
Tormod


--
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/CAL-rJF+4Zb1vM7aeWcXXZi=o3kurvinhxuauquvd9da+l-w...@mail.gmail.com

new -savage and -mga packages needs sponsoring

[Tormod Volden]

Hi,

Can anyone please review these packages and upload them?
(they are still UNRELEASED but I can update that if everything else is fine)

http://alioth.debian.org/~tormod-guest/savage/
http://alioth.debian.org/~tormod-guest/mga/

http://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-video-savage.git;a=summary
http://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-video-mga.git;a=summary

Regards,
Tormod


-- 
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/CAL-rJF+0=t14vxvquzt-2dztrxo3yttndg-3nenbbyaanw4...@mail.gmail.com

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

[Tormod Volden]

 src/mga_dri.c|1 
 src/mga_driver.c |  116 ---
 src/mga_reg.h|3 +
 3 files changed, 105 insertions(+), 15 deletions(-)

New commits:
commit 01ca2186ea028b2549de509b51726aa08519fce0
Author: Christian Toutant ctout...@matrox.com
Date:   Tue Sep 20 13:07:16 2011 -0400

Reset tagfifo for renesas.

For renesas, we need to reset tagfifo after a mode switch.

Signed-off-by: Christian Toutant ctout...@matrox.com

diff --git a/src/mga_driver.c b/src/mga_driver.c
index b140013..58a1390 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -3282,6 +3282,28 @@ MGA_HAL(
outb(0xfac, 0x02);
 }
 
+/* Reset tagfifo*/ 
+   if (pMga-is_G200ER) 
+{
+CARD32 ulMemCtl = INREG(MGAREG_MEMCTL);
+CARD8  ucSeq1;
+
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Reset tagfifo\n);
+/* Screen off */
+   OUTREG8(MGAREG_SEQ_INDEX, 0x01);/* Select SEQ1 */
+   ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20;
+   OUTREG8(MGAREG_SEQ_DATA, ucSeq1);
+
+/* Reset tagfifo */
+OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x00200);
+usleep(1000); /* wait 1ms */
+OUTREG(MGAREG_MEMCTL, ulMemCtl  ~0x00200);
+
+/* Screen on */
+   OUTREG8(MGAREG_SEQ_DATA, ucSeq1  ~0x20);
+
+}
+
 /* 
  This function optimize the Priority Request control
  Higher HiPriLvl will reduce drawing performance
diff --git a/src/mga_reg.h b/src/mga_reg.h
index 5a37db6..ae0fe8c 100644
--- a/src/mga_reg.h
+++ b/src/mga_reg.h
@@ -119,6 +119,9 @@
 #define MGAREG_WACCEPTSEQ   0x1dd4
 #define MGAREG_WMISC0x1e70
 
+
+#define MGAREG_MEMCTL   0x2E08
+
 /* OPMODE register additives */
 
 #define MGAOPM_DMA_GENERAL (0x00  2)

commit c083bf0a66bef9a4345847f39be5fb895c211f79
Author: Christian Toutant ctout...@matrox.com
Date:   Wed Aug 3 09:45:13 2011 -0400

Added support for G200SE Pilot3

Optimize use of bandwidth and increase maximum resolution to 1920x1200

Signed-off-by: Christian Toutant ctout...@matrox.com

diff --git a/src/mga_driver.c b/src/mga_driver.c
index 7232c73..b140013 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -3282,15 +3282,71 @@ MGA_HAL(
outb(0xfac, 0x02);
 }
 
-MGA_NOT_HAL(
-   if (pMga-is_G200SE) {
+/* 
+ This function optimize the Priority Request control
+ Higher HiPriLvl will reduce drawing performance
+ We need to give enough bandwith to crtc to avoid visual artifact
+*/
+   if (pMga-is_G200SE) 
+{
+if (pMga-reg_1e24 = 0x02)
+{
+/* Calulate CRTC Priority value */
+CARD8  ucHiPriLvl;
+CARD32 ulBitsPerPixel;
+CARD32 ulMemoryBandwidth;
+
+/* uiBitsPerPixel can only be 8,16 or32 */
+if (pScrn-bitsPerPixel  16)
+{
+ulBitsPerPixel = 32;
+}
+else if (pScrn-bitsPerPixel   8) 
+{
+ulBitsPerPixel = 16;
+}
+else 
+{
+ulBitsPerPixel = 8;
+}
+
+
+ulMemoryBandwidth = (mode-Clock * ulBitsPerPixel) / 1000;
+
+if  (ulMemoryBandwidth 3100)  ucHiPriLvl = 0;
+else if (ulMemoryBandwidth 2600)  ucHiPriLvl = 1;
+else if (ulMemoryBandwidth 1900)  ucHiPriLvl = 2;
+else if (ulMemoryBandwidth 1160)  ucHiPriLvl = 3;
+else if (ulMemoryBandwidth 440)   ucHiPriLvl = 4;
+else ucHiPriLvl = 5;
+
 OUTREG8(0x1FDE, 0x06);
-   if (pMga-reg_1e24 = 0x01)
-   OUTREG8(0x1FDF, 0x03);
-   else 
-   OUTREG8(0x1FDF, 0x14);
+   OUTREG8(0x1FDF, ucHiPriLvl);
+
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Clock   == %d\n,   
mode-Clock);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, BitsPerPixel== %d\n,   
pScrn-bitsPerPixel);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, MemoryBandwidth == %d\n,   
ulMemoryBandwidth);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, HiPriLvl== %02X\n, 
ucHiPriLvl);
 }
-);
+else
+{
+MGA_NOT_HAL(
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Clock   == 
%d\n,   mode-Clock);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, BitsPerPixel== 
%d\n,   pScrn-bitsPerPixel);
+OUTREG8(0x1FDE, 0x06);
+   if (pMga-reg_1e24 = 0x01)
+{
+   OUTREG8(0x1FDF, 0x03);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, HiPriLvl== 
03\n);
+}
+   else 
+{
+   OUTREG8(0x1FDF, 0x14);
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, HiPriLvl== 
14h\n);
+}
+);
+}
+}
 
 

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

[Tormod Volden]

 ChangeLog|   28 +
 debian/changelog |   10 
 debian/control   |2 
 src/mga_dri.c|1 
 src/mga_driver.c |  116 ---
 src/mga_reg.h|3 +
 6 files changed, 144 insertions(+), 16 deletions(-)

New commits:
commit fe9be5248c08ca69adf84479aa444fa3c2ac5a0b
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Oct 9 23:20:18 2011 +0200

Bump Standards-Version to 3.9.2

diff --git a/debian/changelog b/debian/changelog
index 62c3988..89eb632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-mga (1:1.4.13.dfsg-4) UNRELEASED; urgency=low
 - 01ca218... Reset tagfifo for renesas.
 - c083bf0... Added support for G200SE Pilot3
 - 43280e6... Don't include xf86Priv.h
+  * Bump Standards-Version to 3.9.2 (no changes needed)
 
  -- Tormod Volden debian.tor...@gmail.com  Sun, 09 Oct 2011 23:14:26 +0200
 
diff --git a/debian/control b/debian/control
index 60ee16e..539353e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
  x11proto-xf86dri-dev,
  quilt,
  xutils-dev (= 1:7.5+4)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mga
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mga.git
 

commit 992d6ae23501458f9cd86d658981cc88abfdb12b
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Oct 9 23:17:12 2011 +0200

Update changelogs

diff --git a/ChangeLog b/ChangeLog
index 53ef9fe..c55d36e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+commit 01ca2186ea028b2549de509b51726aa08519fce0
+Author: Christian Toutant ctout...@matrox.com
+Date:   Tue Sep 20 13:07:16 2011 -0400
+
+Reset tagfifo for renesas.
+
+For renesas, we need to reset tagfifo after a mode switch.
+
+Signed-off-by: Christian Toutant ctout...@matrox.com
+
+commit c083bf0a66bef9a4345847f39be5fb895c211f79
+Author: Christian Toutant ctout...@matrox.com
+Date:   Wed Aug 3 09:45:13 2011 -0400
+
+Added support for G200SE Pilot3
+
+Optimize use of bandwidth and increase maximum resolution to 1920x1200
+
+Signed-off-by: Christian Toutant ctout...@matrox.com
+
+commit 43280e6521815582f219d42821d896093c9c0d5f
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Jun 22 17:02:29 2011 -0400
+
+Don't include xf86Priv.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
 commit 5f1b04e86e79938c8158055a777280a649f95510
 Author: Yannick Heneault yhene...@matrox.com
 Date:   Fri Dec 17 09:00:46 2010 -0500
diff --git a/debian/changelog b/debian/changelog
index 9e1bff1..62c3988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-mga (1:1.4.13.dfsg-4) UNRELEASED; urgency=low
+
+  * Merge from upstream up to 01ca2186ea028b2549de509b51726aa08519fce0
+- 01ca218... Reset tagfifo for renesas.
+- c083bf0... Added support for G200SE Pilot3
+- 43280e6... Don't include xf86Priv.h
+
+ -- Tormod Volden debian.tor...@gmail.com  Sun, 09 Oct 2011 23:14:26 +0200
+
 xserver-xorg-video-mga (1:1.4.13.dfsg-3) unstable; urgency=low
 
   * Merge from upstream up to 5f1b04e86e79938c8158055a777280a649f95510

commit 01ca2186ea028b2549de509b51726aa08519fce0
Author: Christian Toutant ctout...@matrox.com
Date:   Tue Sep 20 13:07:16 2011 -0400

Reset tagfifo for renesas.

For renesas, we need to reset tagfifo after a mode switch.

Signed-off-by: Christian Toutant ctout...@matrox.com

diff --git a/src/mga_driver.c b/src/mga_driver.c
index b140013..58a1390 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -3282,6 +3282,28 @@ MGA_HAL(
outb(0xfac, 0x02);
 }
 
+/* Reset tagfifo*/ 
+   if (pMga-is_G200ER) 
+{
+CARD32 ulMemCtl = INREG(MGAREG_MEMCTL);
+CARD8  ucSeq1;
+
+xf86DrvMsg(pScrn-scrnIndex, X_INFO, Reset tagfifo\n);
+/* Screen off */
+   OUTREG8(MGAREG_SEQ_INDEX, 0x01);/* Select SEQ1 */
+   ucSeq1 = INREG8(MGAREG_SEQ_DATA) | 0x20;
+   OUTREG8(MGAREG_SEQ_DATA, ucSeq1);
+
+/* Reset tagfifo */
+OUTREG(MGAREG_MEMCTL, ulMemCtl | 0x00200);
+usleep(1000); /* wait 1ms */
+OUTREG(MGAREG_MEMCTL, ulMemCtl  ~0x00200);
+
+/* Screen on */
+   OUTREG8(MGAREG_SEQ_DATA, ucSeq1  ~0x20);
+
+}
+
 /* 
  This function optimize the Priority Request control
  Higher HiPriLvl will reduce drawing performance
diff --git a/src/mga_reg.h b/src/mga_reg.h
index 5a37db6..ae0fe8c 100644
--- a/src/mga_reg.h
+++ b/src/mga_reg.h
@@ -119,6 +119,9 @@
 #define MGAREG_WACCEPTSEQ   0x1dd4
 #define MGAREG_WMISC0x1e70
 
+
+#define MGAREG_MEMCTL   0x2E08
+
 /* OPMODE register additives */
 
 #define MGAOPM_DMA_GENERAL (0x00  2)

commit c083bf0a66bef9a4345847f39be5fb895c211f79
Author: Christian Toutant ctout...@matrox.com
Date:   Wed Aug 3 09:45:13 2011 -0400

Bug#618900: xserver-xorg-video-mga: does not work with MGA G100 chip

[Tormod Volden]

I have gone through the logs. The detected max dotclock of the monitor
(from EDID) has changed from 90 to 95 MHz. The default mode has
changed from 1280x768@80.1Hz to 1360x768@84.8Hz.

Does it help to change resolution, for instance by blind-typing
xrandr -s 800x600 ?

Can you please also provide the output from xrandr --verbose in both cases?
Either by blind-typing, or starting X like this:
 xinit -e 'sh -c xrandr --verbose  xrandr.log '

Also, with only 6MB of video RAM, you may want to reduce the color
depth. Try starting X with:
 xinit -- -depth 16
and you might get more available resolutions.



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

Bug#618900: Here is Xorg.0.log from Lenny

[Tormod Volden]

Can you please also attach dmesg output? You can for instance
blind-type dmesg  dmesg.txt or pick the right /var/log/kern.log*
after rebooting.



-- 
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/BANLkTinfXMX=pb_7bd8xttfk9vnkuv2...@mail.gmail.com

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

[Tormod Volden]

 man/Makefile.am|4 -
 man/mga.man|1 
 src/binding.h  |1 
 src/mga.h  |   10 ++-
 src/mga_common.h   |2 
 src/mga_dacG.c |  160 ++---
 src/mga_dri.h  |2 
 src/mga_dripriv.h  |2 
 src/mga_driver.c   |   67 --
 src/mga_macros.h   |2 
 src/mga_merge.c|2 
 src/mga_reg.h  |   13 +---
 src/mga_sarea.h|2 
 src/mga_storm.c|1 
 src/mgareg_flags.h |1 
 util/stormdwg.c|5 -
 16 files changed, 220 insertions(+), 55 deletions(-)

New commits:
commit 5f1b04e86e79938c8158055a777280a649f95510
Author: Yannick Heneault yhene...@matrox.com
Date:   Fri Dec 17 09:00:46 2010 -0500

added support for G200ER.

diff --git a/src/mga.h b/src/mga.h
index 7725b56..c520e86 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -136,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
 #define PCI_CHIP_MGAG200_EH_PCI 0x0533
 #endif
 
+#ifndef PCI_CHIP_MGAG200_ER_PCI
+#define PCI_CHIP_MGAG200_ER_PCI 0x0534
+#endif
+
 /*
  * Read/write to the DAC via MMIO 
  */
@@ -199,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
 typedef struct {
 unsigned char  ExtVga[6];
 unsigned char  DacClk[6];
-unsigned char * DacRegs;
+unsigned char  ExtVga_Index24;
+unsigned char  Dac_Index90;
+unsigned char * DacRegs;
 unsigned long  crtc2[0x58];
 unsigned char  dac2[0x21];
 CARD32 Option;
@@ -478,6 +484,7 @@ typedef struct {
 int is_G200WB:1;
 int is_G200EV:1;
 int is_G200EH:1;
+int is_G200ER:1;
 
 int KVM;
 
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index df00765..fca1031 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
 outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
 }
 
+#define G200ER_PLLREF 48000
+#define G200ER_VCOMIN 1056000
+#define G200ER_VCOMAX 1488000
+
+static void MGAG200ERComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *piM, 
int *piN, int *piP)
+{
+
+int  ulM;
+int  ulN;
+int  ulO;
+int  ulR;
+
+CARD32 ulComputedFo;
+CARD32 ulVco;
+CARD32 ulFDelta;
+CARD32 ulFTmpDelta;
+
+CARD32 aulMDivValue[] = {1, 2, 4, 8};
+
+CARD32 ulFo   = lFo;
+
+ulFDelta = 0x;
+
+for (ulR = 0; ulR  4;  ulR++)
+{
+   if(ulFDelta==0) break;
+for (ulN = 5; (ulN = 128) ; ulN++)
+{
+if(ulFDelta==0) break;
+for (ulM = 3; ulM = 0; ulM--)
+{
+   if(ulFDelta==0) break;
+for (ulO = 5; ulO = 32; ulO++)
+{
+   ulVco = (G200ER_PLLREF * (ulN+1)) / (ulR+1);
+   // Validate vco
+if (ulVco  G200ER_VCOMIN) continue;
+   if (ulVco  G200ER_VCOMAX) continue;
+   ulComputedFo = ulVco / (aulMDivValue[ulM] * (ulO+1));
+
+if (ulComputedFo  ulFo)
+{
+ulFTmpDelta = ulComputedFo - ulFo;
+}
+else
+{
+ulFTmpDelta = ulFo - ulComputedFo;
+}
+
+if (ulFTmpDelta  ulFDelta)
+{
+ulFDelta = ulFTmpDelta;
+// XG200ERPIXPLLCM M1:0 O7:3
+*piM = (CARD8)ulM | (CARD8)(ulO3);
+//
+// XG200ERPIXPLLCN N6:0
+*piN = (CARD8)ulN;
+//
+// XG200ERPIXPLLCP R1:0 cg7:4 (Use R value)
+*piP = (CARD8)ulR | (CARD8)(ulR3);
+
+// Test
+int ftest = (G200ER_PLLREF * (ulN+1)) / ((ulR+1) * 
aulMDivValue[ulM] * (ulO+1));
+ftest=ftest;
+}
+} // End O Loop
+} // End M Loop
+} // End N Loop
+} // End R Loop
+}
+
+static void
+MGAG200ERPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
+{
+//TODO  G200ER Validate sequence 
+CARD8 ucPixCtrl, ucTempByte;
+MGAPtr pMga = MGAPTR(pScrn);
+
+
+// Set pixclkdis to 1
+ucPixCtrl = inMGAdac(MGA1064_PIX_CLK_CTL);
+ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_DIS;
+outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
+
+ucTempByte = inMGAdac(MGA1064_REMHEADCTL);
+ucTempByte |= MGA1064_REMHEADCTL_CLKDIS;
+outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
+
+// Select PLL Set C
+ucTempByte = INREG8(MGAREG_MEM_MISC_READ);
+ucTempByte |= (0x32) | 0xc0; //select MGA pixel clock
+OUTREG8(MGAREG_MEM_MISC_WRITE, ucTempByte);
+
+ucPixCtrl = ~MGA1064_PIX_CLK_CTL_CLK_DIS;
+ucPixCtrl |= MGA1064_PIX_CLK_CTL_CLK_POW_DOWN;
+outMGAdac(MGA1064_PIX_CLK_CTL, ucPixCtrl);
+
+// Wait 500 us
+usleep(500);
+
+ 

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

[Tormod Volden]

 ChangeLog   |  125 +
 debian/changelog|   17 
 src/savage_accel.c  |3 
 src/savage_cursor.c |2 
 src/savage_dga.c|8 +-
 src/savage_dri.c|  193 ++--
 src/savage_driver.c |   31 
 src/savage_driver.h |1 
 src/savage_exa.c|3 
 src/savage_hwmc.c   |   10 +-
 src/savage_vbe.c|   10 +-
 src/savage_video.c  |   35 -
 12 files changed, 292 insertions(+), 146 deletions(-)

New commits:
commit be186c1aebb6c656c6e5b9ba7cf91018faa1ae76
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 22:05:06 2011 +0100

New upstream snapshot, bump changelogs

diff --git a/ChangeLog b/ChangeLog
index 29b05ed..f8c4a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,128 @@
+commit aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Feb 13 23:04:09 2011 +0100
+
+Use proper casts on framebuffer addresses
+
+Correction to df8059025cafadaeea7672842d31134ed8c9c5df.
+Casting addresses to int is a 32bitism. If we want to use
+this intermediate cast to silence compiler warnings, we
+should use uintptr_t instead to not introduce potential
+bit truncation.
+
+Thanks to Mark Kettenis for spotting this.
+
+Signed-off-by: Tormod Volden debian.tor...@gmail.com
+
+commit 6b22be096bed59a853e5e1cdd25d8943cce30d4f
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 23:45:49 2011 +0100
+
+savage: Fix initialization typo in SAVAGEDRIMoveBuffers
+
+This was warned about when building with -O2, and seems
+to be a copy-and-paste glitch.
+
+savage_dri.c: In function ‘SAVAGEDRIMoveBuffers’:
+savage_dri.c:1445: warning: ‘pptNew2’ may be used uninitialized in this 
function
+
+commit 9872b5f7ce7a7b07ff68bd2c389c56a3cb1b4ed6
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 22:47:01 2011 +0100
+
+savage: Fix building with TRACEON defined
+
+Two warnings and an error.
+
+commit b018d343e6a6810afdaf1a73091dd9bc8c1c95bd
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 20:23:49 2011 +0100
+
+savage: Setup tiled surface registers in SavageEnterVT
+
+These registers are cleared after suspend/resume, so set them
+up again in EnterVT.
+
+commit f3cd2946d0f38e89643aa6624e6bf35472828995
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 20:23:48 2011 +0100
+
+savage: Factor out a SAVAGEDRISetupTiledSurfaceRegs function
+
+The tiled surface registers were only setup in SAVAGEDRIScreenInit,
+however, after suspend/resume these registers must be set up again.
+So factor it out in a new function so it can be reused.
+
+commit 055ca25faeb9decee091e8c59134c8f537bb7bc3
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 19:28:47 2011 +0100
+
+savage: Cast all handles before printing them
+
+Removes the last bunch of -Wall build warnings.
+
+savage_dri.c:490: warning: format ‘%08lx’ expects type ‘long unsigned int’,
+but argument 5 has type ‘drm_handle_t’
+...
+
+commit 3f18b334812086e5f487a4570a34a3906a67724c
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 15:49:58 2011 +0100
+
+savage: Fix ambiguity in SavageLoadPaletteSavage4
+
+It looks like ! was meant for logic negation and the parentheses
+were wrong.
+
+I don't have a Savage 4 so I can't check if this fixes or breaks
+anything.
+
+commit 6f8aa9c90cccbd893323f5f1892958b7f46e400d
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 15:49:57 2011 +0100
+
+savage: Drop unused variables and functions
+
+Silence -Wall warnings.
+
+The functions are just #if'ed out, to be left for inspiration.
+
+commit df8059025cafadaeea7672842d31134ed8c9c5df
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 12:47:04 2011 +0100
+
+savage: More (intermediate) casts to silence warnings
+
+savage_dga.c: In function ‘Savage_OpenFramebuffer’:
+savage_dga.c:393: warning: cast to pointer from integer of different size
+
+savage_dri.c: In function ‘SAVAGEDRIScreenInit’:
+savage_dri.c:924: warning: cast to pointer from integer of different size
+
+commit 35d9734049a0f701d2c1f84f778f30816176d29e
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 12:47:02 2011 +0100
+
+savage: Replace deprecated x(c)alloc/xfree with m/calloc/free
+
+sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xfree/free/g'
+
+Also replace xrealloc with realloc.
+
+commit 0cbb6d275726aaed648b5ea4dcff45ce14388f91
+Author: Tormod Volden debian.tor...@gmail.com
+Date:   Sun Jan 23 12:47:03 2011 +0100
+
+savage: Add casts to silence build warnings
+
+savage_exa.c: In function ‘SavageUploadToScreen’:
+savage_exa.c:545: warning: passing argument 1 of ‘memcpy’ discards

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

[Tormod Volden]

 .gitignore  |   70 +-
 COPYING |  118 +--
 ChangeLog   |  116 ---
 Makefile.am |   12 ++-
 configure.ac|   50 ++---
 man/.gitignore  |2 
 man/Makefile.am |   59 +--
 man/savage.man  |1 
 src/.gitignore  |6 -
 src/savage_accel.c  |3 
 src/savage_cursor.c |2 
 src/savage_dga.c|8 +-
 src/savage_dri.c|  193 ++--
 src/savage_driver.c |   34 -
 src/savage_driver.h |1 
 src/savage_exa.c|7 +
 src/savage_hwmc.c   |   10 +-
 src/savage_vbe.c|   10 +-
 src/savage_video.c  |   48 +++-
 19 files changed, 398 insertions(+), 352 deletions(-)

New commits:
commit aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Feb 13 23:04:09 2011 +0100

Use proper casts on framebuffer addresses

Correction to df8059025cafadaeea7672842d31134ed8c9c5df.
Casting addresses to int is a 32bitism. If we want to use
this intermediate cast to silence compiler warnings, we
should use uintptr_t instead to not introduce potential
bit truncation.

Thanks to Mark Kettenis for spotting this.

Signed-off-by: Tormod Volden debian.tor...@gmail.com

diff --git a/src/savage_dga.c b/src/savage_dga.c
index 92a179e..1c4d884 100644
--- a/src/savage_dga.c
+++ b/src/savage_dga.c
@@ -390,7 +390,7 @@ Savage_OpenFramebuffer(
 SavagePtr psav = SAVPTR(pScrn);
 
 *name = NULL;   /* no special device */
-*mem = (unsigned char*)(int) psav-FbRegion.base;
+*mem = (unsigned char*)(uintptr_t) psav-FbRegion.base;
 *size = psav-videoRambytes;
 *offset = 0;
 *flags = DGA_NEED_ROOT;
diff --git a/src/savage_dri.c b/src/savage_dri.c
index d43b8eb..e0b9f86 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -922,7 +922,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
pDRIInfo-ddxDriverMinorVersion = SAVAGE_VERSION_MINOR;
pDRIInfo-ddxDriverPatchVersion = SAVAGE_PATCHLEVEL;
 
-   pDRIInfo-frameBufferPhysicalAddress = (pointer)(int) psav-FbRegion.base;
+   pDRIInfo-frameBufferPhysicalAddress = (pointer)(uintptr_t) 
psav-FbRegion.base;
pDRIInfo-frameBufferSize = psav-videoRambytes;
pDRIInfo-frameBufferStride = pScrn-displayWidth*(pScrn-bitsPerPixel/8);
pDRIInfo-ddxDrawableTableEntry = SAVAGE_MAX_DRAWABLES;

commit 6b22be096bed59a853e5e1cdd25d8943cce30d4f
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Jan 23 23:45:49 2011 +0100

savage: Fix initialization typo in SAVAGEDRIMoveBuffers

This was warned about when building with -O2, and seems
to be a copy-and-paste glitch.

savage_dri.c: In function ‘SAVAGEDRIMoveBuffers’:
savage_dri.c:1445: warning: ‘pptNew2’ may be used uninitialized in this 
function

diff --git a/src/savage_dri.c b/src/savage_dri.c
index 2c7a077..d43b8eb 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -1457,7 +1457,7 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, DDXPointRec 
ptOldOrg,
 pboxNew1 = 0;
 pptNew1 = 0;
 pboxNew2 = 0;
-pboxNew2 = 0;
+pptNew2 = 0;
 pptSrc = ptOldOrg;
 
 dx = pParent-drawable.x - ptOldOrg.x;

commit 9872b5f7ce7a7b07ff68bd2c389c56a3cb1b4ed6
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Jan 23 22:47:01 2011 +0100

savage: Fix building with TRACEON defined

Two warnings and an error.

diff --git a/src/savage_driver.c b/src/savage_driver.c
index 1a76c77..3098731 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -648,7 +648,7 @@ static Bool SavageGetRec(ScrnInfoPtr pScrn)
 
 static void SavageFreeRec(ScrnInfoPtr pScrn)
 {
-TRACE(( SavageFreeRec(%x)\n, pScrn-driverPrivate ));
+TRACE(( SavageFreeRec(%p)\n, pScrn-driverPrivate ));
 if (!pScrn-driverPrivate)
return;
 SavageUnmapMem(pScrn, 1);
@@ -3062,7 +3062,7 @@ static void SavageUnmapMem(ScrnInfoPtr pScrn, int All)
 {
 SavagePtr psav = SAVPTR(pScrn);
 
-TRACE((SavageUnmapMem(%x,%x)\n, psav-MapBase, psav-FBBase));
+TRACE((SavageUnmapMem(%p,%p)\n, psav-MapBase, psav-FBBase));
 
 if (psav-PrimaryVidMapped) {
 vgaHWUnmapMem(pScrn);
@@ -4064,7 +4064,7 @@ SavageDoAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int 
crtc2)
 SavagePtr psav = SAVPTR(pScrn);
 int address=0,top=0,left=0,tile_height,tile_size;
 
-TRACE((SavageDoAdjustFrame(%d,%d,%x)\n, x, y, flags));
+TRACE((SavageDoAdjustFrame(%d,%d,%d)\n, x, y, crtc2));
 
 if (psav-Chipset == S3_SAVAGE2000) {
 tile_height = TILEHEIGHT_2000; /* 32 */

commit b018d343e6a6810afdaf1a73091dd9bc8c1c95bd
Author: Tormod Volden debian.tor...@gmail.com
Date:   Sun Jan 23 20:23:49 2011 +0100

savage: Setup tiled surface registers in SavageEnterVT

These registers are cleared after suspend/resume, so set them
up again in EnterVT.

diff --git a/src/savage_driver.c b

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

[Tormod Volden]

 ChangeLog  |   37 
 debian/changelog   |   12 +++
 man/Makefile.am|4 -
 man/mga.man|1 
 src/binding.h  |1 
 src/mga.h  |   10 ++-
 src/mga_common.h   |2 
 src/mga_dacG.c |  160 ++---
 src/mga_dri.h  |2 
 src/mga_dripriv.h  |2 
 src/mga_driver.c   |   67 --
 src/mga_macros.h   |2 
 src/mga_merge.c|2 
 src/mga_reg.h  |   13 +---
 src/mga_sarea.h|2 
 src/mga_storm.c|1 
 src/mgareg_flags.h |1 
 util/stormdwg.c|5 -
 18 files changed, 269 insertions(+), 55 deletions(-)

New commits:
commit b331bd47b60670988b7d65287e564f16fdeea2d2
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 21:09:01 2011 +0100

New upstream snapshot, bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 8036354..53ef9fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+commit 5f1b04e86e79938c8158055a777280a649f95510
+Author: Yannick Heneault yhene...@matrox.com
+Date:   Fri Dec 17 09:00:46 2010 -0500
+
+added support for G200ER.
+
+commit f7a2ef60e18e2cc464f69c1cad4681096c645651
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Sat Oct 30 09:38:31 2010 -0700
+
+Sun's copyrights now belong to Oracle
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 636c3c88e7e9cb30010fe1731cd7356849f3f172
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Oct 14 14:36:06 2010 -0400
+
+Don't allow the config file to override BIOS location
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 0bd44fad450843b7f1c35c70ab356a2b250d107d
+Author: Jesse Adkins jesserayadk...@gmail.com
+Date:   Tue Sep 28 13:29:51 2010 -0700
+
+Purge cvs tags.
+
+Signed-off-by: Jesse Adkins jesserayadk...@gmail.com
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 951474c7fcd1b28d3178a6644d58958cb3bdf5a8
+Author: Yannick Heneault yhene...@matrox.com
+Date:   Wed Aug 25 11:16:27 2010 -0400
+
+modified G200SE conditionnal statement about revision register for 
products compatibility.
+
 commit c08b112bfe14fbfe713e4757eb0b704c8ed1f339
 Author: Adam Jackson a...@redhat.com
 Date:   Tue Aug 10 10:58:41 2010 -0400
diff --git a/debian/changelog b/debian/changelog
index 76a9311..41fae66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xserver-xorg-video-mga (1:1.4.13+git20110221.5f1b04e.dfsg-1) UNRELEASED; 
urgency=low
+
+  * New upstream snapshot
+- 5f1b04e... added support for G200ER.
+- f7a2ef6... Sun's copyrights now belong to Oracle
+- 636c3c8... Don't allow the config file to override BIOS location
+- 0bd44fa... Purge cvs tags.
+- 951474c... modified G200SE conditionnal statement about revision
+  register for products compatibility.
+
+ -- Tormod Volden debian.tor...@gmail.com  Mon, 21 Feb 2011 20:45:57 +0100
+
 xserver-xorg-video-mga (1:1.4.13.dfsg-2) unstable; urgency=low
 
   * Switch to dh:

commit 5f1b04e86e79938c8158055a777280a649f95510
Author: Yannick Heneault yhene...@matrox.com
Date:   Fri Dec 17 09:00:46 2010 -0500

added support for G200ER.

diff --git a/src/mga.h b/src/mga.h
index 7725b56..c520e86 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -136,6 +136,10 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
 #define PCI_CHIP_MGAG200_EH_PCI 0x0533
 #endif
 
+#ifndef PCI_CHIP_MGAG200_ER_PCI
+#define PCI_CHIP_MGAG200_ER_PCI 0x0534
+#endif
+
 /*
  * Read/write to the DAC via MMIO 
  */
@@ -199,7 +203,9 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*);
 typedef struct {
 unsigned char  ExtVga[6];
 unsigned char  DacClk[6];
-unsigned char * DacRegs;
+unsigned char  ExtVga_Index24;
+unsigned char  Dac_Index90;
+unsigned char * DacRegs;
 unsigned long  crtc2[0x58];
 unsigned char  dac2[0x21];
 CARD32 Option;
@@ -478,6 +484,7 @@ typedef struct {
 int is_G200WB:1;
 int is_G200EV:1;
 int is_G200EH:1;
+int is_G200ER:1;
 
 int KVM;
 
diff --git a/src/mga_dacG.c b/src/mga_dacG.c
index df00765..fca1031 100644
--- a/src/mga_dacG.c
+++ b/src/mga_dacG.c
@@ -444,6 +444,116 @@ MGAG200WBPIXPLLSET(ScrnInfoPtr pScrn, MGARegPtr mgaReg)
 outMGAdac(MGA1064_REMHEADCTL, ucTempByte);
 }
 
+#define G200ER_PLLREF 48000
+#define G200ER_VCOMIN 1056000
+#define G200ER_VCOMAX 1488000
+
+static void MGAG200ERComputePLLParam(ScrnInfoPtr pScrn, long lFo, int *piM, 
int *piN, int *piP)
+{
+
+int  ulM;
+int  ulN;
+int  ulO;
+int  ulR;
+
+CARD32 ulComputedFo;
+CARD32 ulVco;
+CARD32 ulFDelta;
+CARD32 ulFTmpDelta;
+
+CARD32 aulMDivValue[] = {1, 2, 4, 8};
+
+CARD32 ulFo   = lFo;
+
+ulFDelta = 0x;
+
+for (ulR = 0; ulR  4;  ulR++)
+{
+   if(ulFDelta==0) break;
+for (ulN = 5; (ulN = 128) ; ulN++)
+{
+if(ulFDelta==0) break;
+for (ulM = 3; ulM

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

[Tormod Volden]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d87e0ca7719fef4e3a39e9a544ed67ba269de08
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 22:51:04 2011 +0100

Fix debian version to simply bump revision

So that we can use the same tarball.

diff --git a/debian/changelog b/debian/changelog
index 41fae66..a3baed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-mga (1:1.4.13+git20110221.5f1b04e.dfsg-1) UNRELEASED; 
urgency=low
+xserver-xorg-video-mga (1:1.4.13.dfsg-3) UNRELEASED; urgency=low
 
-  * New upstream snapshot
+  * Merge from upstream up to 5f1b04e86e79938c8158055a777280a649f95510
 - 5f1b04e... added support for G200ER.
 - f7a2ef6... Sun's copyrights now belong to Oracle
 - 636c3c8... Don't allow the config file to override BIOS location


-- 
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/e1prdgd-0007y7...@alioth.debian.org

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

[Tormod Volden]

 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab985e3104b5c8747638da2e52879edf0a059c22
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 22:54:04 2011 +0100

Fix debian version to simply bump revision

So that we can use the same tarball.

diff --git a/debian/changelog b/debian/changelog
index 226d5cb..ed86d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-savage (1:2.3.2+git20110221.aff8f96-1) UNRELEASED; 
urgency=low
+xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low
 
-  * New upstream snapshot:
+  * Merge from upstream up to aff8f966c6d3f7dbad2d92d040ce7f5c4b286eef
 - aff8f96... Use proper casts on framebuffer addresses
 - 6b22be0... savage: Fix initialization typo in SAVAGEDRIMoveBuffers
 - 9872b5f... savage: Fix building with TRACEON defined


-- 
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/e1prdiu-0007pz...@alioth.debian.org

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

[Tormod Volden]

 debian/changelog |1 +
 debian/control   |4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 98f48aaa0e6949487048f76337d4cd29b68b78a4
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 23:38:58 2011 +0100

Add myself as uploader

diff --git a/debian/changelog b/debian/changelog
index ed86d4b..f7c9fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-video-savage (1:2.3.2-3) UNRELEASED; urgency=low
 - df80590... savage: More (intermediate) casts to silence warnings
 - 35d9734... savage: Replace deprecated x(c)alloc/xfree with m/calloc/free
 - 0cbb6d2... savage: Add casts to silence build warnings
+  * Add myself as uploader
 
  -- Tormod Volden debian.tor...@gmail.com  Mon, 21 Feb 2011 22:00:45 +0100
 
diff --git a/debian/control b/debian/control
index cdf07ed..ed6e160 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: xserver-xorg-video-savage
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org
+Uploaders:
+ Cyril Brulebois k...@debian.org,
+ Tormod Volden debian.tor...@gmail.com
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,


-- 
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/e1prepp-mi...@alioth.debian.org

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

[Tormod Volden]

 debian/changelog |1 +
 debian/control   |4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5f8cda27030557a198748b97f568da9927f89969
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Feb 21 23:41:14 2011 +0100

Add myself as uploader

diff --git a/debian/changelog b/debian/changelog
index a3baed2..955d5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-mga (1:1.4.13.dfsg-3) UNRELEASED; urgency=low
 - 0bd44fa... Purge cvs tags.
 - 951474c... modified G200SE conditionnal statement about revision
   register for products compatibility.
+  * Add myself as uploader
 
  -- Tormod Volden debian.tor...@gmail.com  Mon, 21 Feb 2011 20:45:57 +0100
 
diff --git a/debian/control b/debian/control
index bdfd6ce..60ee16e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: xserver-xorg-video-mga
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org
+Uploaders:
+ Cyril Brulebois k...@debian.org,
+ Tormod Volden debian.tor...@gmail.com
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,


-- 
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/e1pres5-0001ea...@alioth.debian.org

Bug#611400: ITP: wayland -- new generation compositor

[Tormod Volden]

FWIW, have you seen Bryce's test packages here:
https://launchpad.net/~xorg-edgers/+archive/wayland



-- 
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/aanlktin3jsgjv_bai+ajeu0mfbeyfsrjsh9pw1aak...@mail.gmail.com

mesa: Changes to 'debian-experimental'

[Tormod Volden]

Rebased ref, commits from common ancestor:


-- 
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/e1obzuw-0008tt...@alioth.debian.org

mesa: Changes to 'debian-experimental'

[Tormod Volden]

New branch 'debian-experimental' available with the following commits:


-- 
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/e1obzzb-zq...@alioth.debian.org

mesa: Changes to 'debian-experimental'

[Tormod Volden]

 debian/changelog |6 ++
 debian/control   |2 +-
 debian/rules |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 0d685d41fcef954ef13adbb7a306a4a3270b1b72
Author: Tormod Volden debian.tor...@gmail.com
Date:   Thu Apr 22 22:02:44 2010 +0200

Do not strip the same packages twice

diff --git a/debian/changelog b/debian/changelog
index 65ffa31..b426834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.8.1-2) UNRELEASED; urgency=low
+
+  * debian/rules: Do not strip the same packages twice
+
+ -- Tormod Volden debian.tor...@gmail.com  Sun, 09 May 2010 12:37:53 +0200
+
 mesa (7.8.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index bbff145..0e61cac 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Standards-Version: 3.8.4
-Build-Depends: debhelper (= 6.0.7), quilt (= 0.40), pkg-config,
+Build-Depends: debhelper (= 7.2.7), quilt (= 0.40), pkg-config,
  libdrm-dev (= 2.4.19) [!hurd-i386], libx11-dev, xutils-dev,
  x11proto-gl-dev (= 1.4.11), libxxf86vm-dev,
  libexpat1-dev, lesstif2-dev, dpkg-dev (= 1.13.19), libxfixes-dev,
diff --git a/debian/rules b/debian/rules
index 8a22ea8..76bed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ binary-arch: install
dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-   dh_strip -s
+   dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s


-- 
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/e1obzzt-bw...@alioth.debian.org

Re: [PATCH] mesa: do not strip the same packages twice

[Tormod Volden]

On Sat, May 8, 2010 at 12:34 PM, Julien Cristau jcris...@debian.org wrote:
 Hi Tormod,

 On Thu, Apr 22, 2010 at 22:29:41 +0200, Tormod Volden wrote:

 From: Tormod Volden debian.tor...@gmail.com

 ---
  debian/rules |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/debian/rules b/debian/rules
 index 8a22ea8..76bed7d 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -233,7 +233,7 @@ binary-arch: install
       dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
       dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
       dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
 -     dh_strip -s
 +     dh_strip -s --remaining-packages
       dh_compress -s
       dh_fixperms -s
       dh_makeshlibs -s

 --remaining-packages needs a versioned build-dep on debhelper 7.2.7.
 With that added, ack for the experimental branch.

 Thanks,
 Julien


Thanks, I will go ahead and push this to git then.
Tormod
From be3ebc7459b6b1c62b4f996e5c36a9c23ce6f132 Mon Sep 17 00:00:00 2001
From: Tormod Volden debian.tor...@gmail.com
Date: Thu, 22 Apr 2010 22:02:44 +0200
Subject: [PATCH] Do not strip the same packages twice

---
 debian/changelog |6 ++
 debian/control   |2 +-
 debian/rules |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65ffa31..b426834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.8.1-2) UNRELEASED; urgency=low
+
+  * debian/rules: Do not strip the same packages twice
+
+ -- Tormod Volden debian.tor...@gmail.com  Sun, 09 May 2010 12:37:53 +0200
+
 mesa (7.8.1-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index bbff145..0e61cac 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin bgog...@debian.org
 Standards-Version: 3.8.4
-Build-Depends: debhelper (= 6.0.7), quilt (= 0.40), pkg-config,
+Build-Depends: debhelper (= 7.2.7), quilt (= 0.40), pkg-config,
  libdrm-dev (= 2.4.19) [!hurd-i386], libx11-dev, xutils-dev,
  x11proto-gl-dev (= 1.4.11), libxxf86vm-dev,
  libexpat1-dev, lesstif2-dev, dpkg-dev (= 1.13.19), libxfixes-dev,
diff --git a/debian/rules b/debian/rules
index 8a22ea8..76bed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ binary-arch: install
 	dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
 	dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
 	dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-	dh_strip -s
+	dh_strip -s --remaining-packages
 	dh_compress -s
 	dh_fixperms -s
 	dh_makeshlibs -s
-- 
1.7.0.4

Re: [PATCH] mesa: do not strip the same packages twice

[Tormod Volden]

On Fri, Apr 23, 2010 at 2:27 AM, Julien Cristau jcris...@debian.org wrote:
 Hi Tormod,

 On Thu, Apr 22, 2010 at 22:29:41 +0200, Tormod Volden wrote:

 From: Tormod Volden debian.tor...@gmail.com

 ---
  debian/rules |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

 diff --git a/debian/rules b/debian/rules
 index 8a22ea8..76bed7d 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -233,7 +233,7 @@ binary-arch: install
       dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
       dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
       dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
 -     dh_strip -s
 +     dh_strip -s --remaining-packages
       dh_compress -s
       dh_fixperms -s
       dh_makeshlibs -s

 Can you explain a bit more in the commit message what this fixes?  Is
 that related to the pkg-create-dbgsym issue you had on ubuntu?

 Cheers,
 Julien


Hi,
It does not necessarily fix anything other than that the stripping
is tried twice for the same package. Which I don't think is intended,
and in the best case is a waste of time and CPU cycles. Yes, I
discovered this when tracking down the pkg-create-dbgsym issue.

Cheers,
Tormod


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

[PATCH] mesa: do not strip the same packages twice

[Tormod Volden]

From: Tormod Volden debian.tor...@gmail.com

---
 debian/rules |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8a22ea8..76bed7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ binary-arch: install
dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-   dh_strip -s
+   dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
dh_makeshlibs -s
-- 
1.7.0.4


-- 
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/1271968181-8911-1-git-send-email-lists.tor...@gmail.com

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

[Tormod Volden]

 debian/changelog |7 +++
 src/sis_driver.c |2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 94a59e5aee8259baca57479561185e2970115b2d
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:10:46 2010 +0100

Update changelog with previous cherry-pick

diff --git a/debian/changelog b/debian/changelog
index f12672b..63b3dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
+
+  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+
+ -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 22:30:07 +0100
+
 xserver-xorg-video-sis (1:0.10.2-2) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no

commit 0b6e1ce4d753617ba2e1e579f9c731a2df6ca2fe
Author: Matteo Delfino kendats...@gmail.com
Date:   Wed Oct 21 10:26:45 2009 -0400

Fix BIOS read on 650 and 760. (#19070)

Signed-off-by: Matteo Delfino kendats...@gmail.com
Signed-off-by: Adam Jackson a...@redhat.com
(cherry picked from commit 8370499d4035ec7a5c8e1f1b04d5a6c404883442)

diff --git a/src/sis_driver.c b/src/sis_driver.c
index 994b02d..b19e7a9 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 case SIS_315H:
 case SIS_330:
 case SIS_340:
+case SIS_650:
+case SIS_760:
 case XGI_40: readpci = TRUE;
  break;
 case XGI_20: readpci = TRUE;


-- 
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/e1ntpzg-0006g3...@alioth.debian.org

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

[Tormod Volden]

 .gitignore   |   70 --
 ChangeLog|   87 
 Makefile.am  |   11 +++
 configure.ac |   19 --
 man/.gitignore   |2 
 man/Makefile.am  |   41 ++---
 man/sis.man  |2 
 src/.gitignore   |6 -
 src/sis.h|4 -
 src/sis_driver.c |  169 +--
 src/sis_video.c  |4 -
 11 files changed, 128 insertions(+), 287 deletions(-)

New commits:
commit d33e45dcaee511d5f09ac5f68680e96f3ad60076
Author: Alan Coopersmith alan.coopersm...@sun.com
Date:   Fri Jan 15 13:55:44 2010 -0800

Update Sun license notices to current X.Org standard form

Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com

diff --git a/man/Makefile.am b/man/Makefile.am
index d076dc4..1b26ac2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# 
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-# 
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-# 
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the Software),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
 # 
 
 drivermandir = $(DRIVER_MAN_DIR)

commit 2c9b8ace01d94e95ca4ad7216146339940dd
Author: Gaetan Nadon mems...@videotron.ca
Date:   Tue Dec 15 21:47:35 2009 -0500

configure.ac: use backticks rather than $() for cmd subs

Use $PKG_CONFIG rather than hard coded pkg-config

Acked-by: Dan Nicholson dbn.li...@gmail.com
Acked-by: Daniel Stone dan...@fooishbar.org

Signed-off-by: Gaetan Nadon mems...@videotron.ca

diff --git a/configure.ac b/configure.ac
index 440dc0c..6705994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(XEXT, [xextproto = 7.0.99.1],
   HAVE_XEXTPROTO_71=yes; AC_DEFINE(HAVE_XEXTPROTO_71, 1, 
[xextproto 7.1 available]),
   HAVE_XEXTPROTO_71=no)
 AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test $HAVE_XEXTPROTO_71 = yes ])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
 
 # Checks for libraries.
 

commit cbfa94ccb1ee6213342014f3c7063362acb274ff
Author: Gaetan Nadon mems...@videotron.ca
Date:   Mon Nov 23 09:25:05 2009 -0500

Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES

Now that the INSTALL file is generated.
Allows running make maintainer-clean.

diff --git a/Makefile.am b/Makefile.am
index 94f35e1..9ab8bf9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 if BUILD_LINUXDOC
 README: README.sgml

commit a69569c72ea19d4d76c57a8077542fee4aeb501a
Author: Gaetan Nadon mems...@videotron.ca
Date:   Wed Oct 28 14:41:41 2009 -0400

INSTALL, NEWS, README or AUTHORS files are 

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

[Tormod Volden]

 debian/changelog |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit d2b4d40af21a851dca12e4bf9c3cbd4ec0fb8043
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:28:31 2010 +0100

Fix version in changelog and merge entries.

diff --git a/debian/changelog b/debian/changelog
index 63b3dcd..a0472a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,15 @@
-xserver-xorg-video-sis (1:0.10.2-3) unstable; urgency=low
-
-  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
-Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
-
- -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 22:30:07 +0100
-
-xserver-xorg-video-sis (1:0.10.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 01:56:20 +0100
+  [ Tormod Volden ]
+  * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+
+ -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 23:27:06 +0100
 
 xserver-xorg-video-sis (1:0.10.2-1) experimental; urgency=low
 


-- 
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/e1ntq7n-kd...@alioth.debian.org

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

[Tormod Volden]

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

New commits:
commit 961762c59f168621c2c0ab36ba514b730f520018
Author: Tormod Volden debian.tor...@gmail.com
Date:   Mon Mar 22 23:31:26 2010 +0100

Add bug closer for launchpad too.

diff --git a/debian/changelog b/debian/changelog
index a0472a2..a6d7c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ xserver-xorg-video-sis (1:0.10.2-2) unstable; urgency=low
 
   [ Tormod Volden ]
   * Cherry-pick 8370499d4035ec7a5c8e1f1b04d5a6c404883442
-Fix BIOS read on 650 and 760. (#19070) Closes: #546714.
+Fix BIOS read on 650 and 760. (#19070) Closes: #546714. LP: #287475
 
  -- Tormod Volden debian.tor...@gmail.com  Mon, 22 Mar 2010 23:27:06 +0100
 


-- 
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/e1ntqac-hs...@alioth.debian.org

Bug#544484: [PATCH] Fix amd64 typo in preinst package divert

[Tormod Volden]

tags 544484 patch
thanks

BTW, the patch is against the debian-experimental git branch, not master.



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#544484: [PATCH] Fix amd64 typo in preinst package divert

[Tormod Volden]

Package: drm-snapshot

Signed-off-by: Tormod Volden debian.tor...@gmail.com
---
 debian/preinst.modules.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/preinst.modules.in b/debian/preinst.modules.in
index d32049c..26e4c0f 100644
--- a/debian/preinst.modules.in
+++ b/debian/preinst.modules.in
@@ -11,7 +11,7 @@ case ${1} in
--divert $dir/drm.ko.linux $dir/drm.ko
 
for driver in $drivers; do
-   dpkg-divert --package drm-modul...@kernel@-amd64 --add 
--rename \
+   dpkg-divert --package drm-modul...@kernel@ --add 
--rename \
--divert $dir/$driver/$driver.ko.linux \
$dir/$driver/$driver.ko
done
-- 
1.6.3.3




-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#503001: radeonhd: radeonhd 1.2.3 kde/xserver crash on log-out

[Tormod Volden]

The original issue in this report, Failed to map FB, seems to be the
one reported upstream in
http://bugs.freedesktop.org/show_bug.cgi?id=21233 and is now fixed in
http://cgit.freedesktop.org/xorg/driver/xf86-video-radeonhd/commit/?id=881334543d2711f159c8fcaf4a30b8b0db3186d7



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#520547: uses bogus panel information

[Tormod Volden]

Package: xserver-xorg-video-ati
Version: 1:2.2.1-4

The problem appears if a savage laptop chipset is used without a
connected LCD panel, for instance in small-form-factor PCs. The driver
will extract sync range information from the panel information which
is not valid.

The fix has been applied upstream in
http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=0fae48235841f05d7e52e61a2450835fdb8892b3

Also reported in Ubuntu, https://bugs.launchpad.net/bugs/294899

Tormod



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#518411: does not build libdrm_nouveau1

[Tormod Volden]

Package: drm-snapshot
Version: 2.4.4+git+20090205+8b88036-1
Tags: patch

Actually, this might happen because I am pulling down a newer version
from upstream, so it might not be a bug in the current package but
could be in the next :)

After the upstream commit
http://cgit.freedesktop.org/mesa/drm/commit/?id=7e5c512104c3ae9b4ddd121f6bbf9464f8d73181
the libdrm_nouveau1 shared libraries are not built since configure
needs --enable-nouveau-experimental-api=yes in order to build it.

I am attaching the patch as well, since gmail usually breaks inline patches.

From: Tormod Volden debian.tor...@gmail.com
Date: Thu, 5 Mar 2009 23:53:36 +0100
Subject: [PATCH] configure with --enable-nouveau-experimental-api=yes

in order to have libdrm_nouveau1 built

Signed-off-by: Tormod Volden debian.tor...@gmail.com
---
 debian/rules |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index f4cdaf3..ad02eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-static=yes \
+   --enable-nouveau-experimental-api=yes \
CFLAGS=$(CFLAGS)

 build: build-stamp
-- 
1.6.0.4
From c434c691cb0565254d2266eb2faba18b6a136222 Mon Sep 17 00:00:00 2001
From: Tormod Volden debian.tor...@gmail.com
Date: Thu, 5 Mar 2009 23:53:36 +0100
Subject: [PATCH] configure with --enable-nouveau-experimental-api=yes

in order to have libdrm_nouveau1 built

Signed-off-by: Tormod Volden debian.tor...@gmail.com
---
 debian/rules |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index f4cdaf3..ad02eb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--enable-static=yes \
+		--enable-nouveau-experimental-api=yes \
 		CFLAGS=$(CFLAGS)
 
 build: build-stamp
-- 
1.6.0.4

Bug#518411: does not build libdrm_nouveau1

[Tormod Volden]

On Fri, Mar 6, 2009 at 12:19 AM, Chris Lamb ch...@chris-lamb.co.uk wrote:
 Tormod Volden wrote:

 Actually, this might happen because I am pulling down a newer version
 from upstream

 It is. There was an additional issue with building lidrm_nouveau, hence the
 lack of the upload recently.

It built just fine here with the above patch,
https://launchpad.net/~xorg-edgers/+archive/ppa/+sourcepub/508239/+listing-archive-extra
but I haven't actually tried installing and running it.



-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#483989: xserver-xorg-video-savage: system freeze while starting X

[Tormod Volden]

You listed 5 reverted commits above. Did you try to narrow down which
ones you need to revert? Or are they all broken by the
02_temporary_revert_pciaccess.diff?

You can also try to start the server with sudo strace Xorg from
another machine, or sudo gdb Xorg. Sometimes the debugging makes the
execution slow enough that you will get something in the log. If you
try gdb, setting breakpoints around/inside SavageMapMem might be an
idea as well, to find where it blows up.

And does the standard tricks of Option BusType PCI and Option
DRI off make any change?

Cheers,
Tormod



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#435040: xserver-xorg-video-ati: switching VT from console

[Tormod Volden]

There are plenty of people having this problem in Ubuntu as well,
https://bugs.launchpad.net/bugs/148408, with some reports of old
patches that works around it.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#484180: mesa: some ASM optimizations must be disabled for non-AMD 64-bit

[Tormod Volden]

Package: mesa
Severity: normal
Tags: patch


This was reported in Ubuntu https://bugs.launchpad.net/bugs/87661 and I 
don't have the hardware to reproduce it, but I think this will be the 
same in Debian:

The ASM optimizations on mesa 64-bit builds include instructions (like 
for instance 3dnow) that are not available on Intel 64-bit processors, 
and hence some GL applications crash with SIGILL.

The proposed patch, in form of a Xsession.d script, sets the MESA_NO_ASM 
flag when 64-bit mesa is detected on a processor not having support for 
3dnow instructions.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-486
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
:
# /etc/X11/Xsession.d/65mesa-check-x86-64

# This file is sourced by Xsession(5), not executed.

# If we are running the 64-bit mesa code, we need to disable ASM
# optimizations if we are on a non-AMD processor without 3dnow instructions
# (until this get fixed in the mesa libraries)

if [ `dpkg --print-architecture` = amd64 ] 
   ! grep -q ^flags.*3dnow /proc/cpuinfo
then
  MESA_NO_ASM=1
  export MESA_NO_ASM
fi

Bug#464588: xterm: enable highlighting of URLs and addresses

[Tormod Volden]

On Feb 8, 2008 4:03 PM, Julien Cristau [EMAIL PROTECTED] wrote:
 IMO this is a matter of personal preference, and it's easy enough to
 uncomment that line or add it to ~/.Xresources for anyone who wants this
 behaviour.

I do agree it is a matter of personal preference, but I would guess
this behaviour would be preferred by most people. And it's easy enough
to comment it or add something to .Xresources for those who don't want
it :) One could even argue that among those who don't like to edit
their .Xresources there's even a stronger majority that would prefer
an intuitive, user-friendly behaviour out-of-the-box.

But if there's for instance a policy of not diverting defaults from
upstream, I would accept that as well.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#464588: xterm: patch as debdiff

[Tormod Volden]

Package: xterm
Version: 231-1
Followup-For: Bug #464588

It's basically a one-character patch, however I'll attach a full debdiff 
in case it can be convenient.
diff -u xterm-231/debian/changelog xterm-231/debian/changelog
--- xterm-231/debian/changelog
+++ xterm-231/debian/changelog
@@ -1,3 +1,10 @@
+xterm (231-2) unstable; urgency=low
+
+  * 950_enable_highlighting.dpatch: enable URL highlighting in XTerm.ad
+(Closes: #464588)
+
+ -- Tormod Volden [EMAIL PROTECTED]  Thu, 07 Feb 2008 22:13:00 +0100
+
 xterm (231-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- xterm-231.orig/debian/patches/950_enable_highlighting.dpatch
+++ xterm-231/debian/patches/950_enable_highlighting.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 950_enable_highlighting.dpatch by  [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad xterm-231~/XTerm.ad xterm-231/XTerm.ad
+--- xterm-231~/XTerm.ad2007-11-26 19:42:37.0 +0100
 xterm-231/XTerm.ad 2008-02-07 22:07:26.0 +0100
+@@ -183,7 +183,7 @@
+ *SimpleMenu*borderWidth: 2
+ 
+ ! Here is a pattern that is useful for double-clicking on a URL:
+-!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
++*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
+ !
+ ! Alternatively,
+ !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./[EMAIL 
PROTECTED]|(%[[:xdigit:]][[:xdigit:]]))+

Bug#464588: xterm: enable highlighting of URLs and addresses

[Tormod Volden]

Package: xterm
Version: 231-1
Severity: wishlist
Tags: patch


The highlighting of text (when clicking on it) groups words but doesn't 
select completely URLs, e-mail addresses etc. There is a ready-made 
configuration for it in XTerm.ad, it just needs to be commented out. I 
think this should be enabled by default.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-486
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xterm depends on:
ii  libc6 2.7-6  GNU C Library: Shared libraries
ii  libfontconfig12.5.0-2generic font configuration library
ii  libice6   2:1.0.4-1  X11 Inter-Client Exchange library
ii  libncurses5   5.6+20080119-1 Shared libraries for terminal hand
ii  libsm62:1.0.3-1+b1   X11 Session Management library
ii  libx11-6  2:1.0.3-7  X11 client-side library
ii  libxaw7   2:1.0.4-1  X11 Athena Widget library
ii  libxext6  1:1.0.3-2  X11 miscellaneous extension librar
ii  libxft2   2.1.12-2   FreeType-based font drawing librar
ii  libxmu6   2:1.0.4-1  X11 miscellaneous utility library
ii  libxt61:1.0.5-3  X11 toolkit intrinsics library
ii  xbitmaps  1.0.1-2Base X bitmaps

Versions of packages xterm recommends:
ii  xutils1:7.3+10   X Window System utility programs m

-- no debconf information



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#449280: xserver-xorg-video-sis: DRI fails because of server version misdetection

[Tormod Volden]

Package: xserver-xorg-video-sis
Version: 1:0.9.3-5
Severity: normal

https://edge.launchpad.net/bugs/118325

The DDX interface is incompatible with Xorg, so it complains when 
running glxinfo, and DRI is disabled:

SiS DRI driver expected DDX version 0-0.8.x but got version 0.7.1

This is fixed by commit 391dad44fa305be4cded31cf2f9a4fba7420af99 from 
upstream: Fix xserver version detection.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#438975: obsolete savage_image.c in xserver-xorg-video-savage_2.1.3-1.diff.gz

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 2.1.3-1

The src/savage_image.c was deleted from upstream git 2006-04-30
(commit 6d688c993ec7baf8f00df59764dd3e04bab24e09) but is still left
over in the Debian diff.gz.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#319388: extraneous files in mesa_7.0.1-1.diff.gz

[Tormod Volden]

 Third - The Debian diff for mesa-7.0.1-1 looks very strange.  There
 are a whole lot of files being created by it, outside of debian/,
 including enormous blocks of what looks like upstream source code.
 There's *also* a debian/patches directory, and logic in debian/rules
 to use it.  As a result I don't know how you want me to generate the
 patch.  Could you explain a litle about how the packaging is being
 done?

 Thanks,
 zw


I also noticed this (reported it in
https://bugs.launchpad.net/bugs/122994). These files (mostly in
src/mesa/glapi/ and windows/VC6/mesa/ ) exist in upstream git, but not
in the upstream release. I guess they are there by mistake, maybe the
diff was made between a git-based tree and the upstream released tree?


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#319388: extraneous files in mesa_7.0.1-1.diff.gz

[Tormod Volden]

  src/mesa/glapi/ and windows/VC6/mesa/ ) exist in upstream git, but not
  in the upstream release. I guess they are there by mistake, maybe the
  diff was made between a git-based tree and the upstream released tree?
 
 Yes, the package is built from git, so files which are in git but not in
 the tarballs end up in the debian diff.  Why is that a problem?

No practical problem I guess, but it doesn't look right :) If upstream
had a reason for stripping these things out of the release, why should
we put them back? Isn't there a practice of keeping diffs as small and
clean as possible?

But I understand that the Debian git is tracking upstream git during
development, and that it might mean extra work to filter out these
files.

Would it work to make the diff against the git head of the release,
and then use this diff against the released tarballs? Supposing that
we haven't touched these files in question, they would not appear
then.

Tormod


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#428089:

[Tormod Volden]

I have filed this upstream at https://bugs.freedesktop.org/show_bug.cgi?id=11237


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#428089: xserver-xorg-video-savage: consoles black or corrupted after X shutdown

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 1:2.1.2-5
Severity: normal


After I log out from a X session, the virtual consoles are unusable. Either I 
see coloured lines (same colours 
as my desktop background) or it's all black. The same happens when I run startx 
from a console and log out from X 
again.

If I instead switch to a console and run /etc/init.d/gdm stop, they are fine. 
But if I switch to a console and 
run sleep 10; kill pid of x-session-manager and then switch back to X 
before the killing, they go bad.

So it seems to me they get corrupted if I am on the X screen when X goes down. 
If I am on a console when X goes 
down, there are no problems.

(I have also tested with savage git from 20070512, same same)

-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/etc/X11/X target does not match checksum in /var/lib/x11/X.md5sum.

X server symlink status:
lrwxrwxrwx 1 root root 13 2006-09-04 20:32 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 1736280 2007-06-01 15:28 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA 
Controller (TwisterK) (rev 01)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 3043 2007-05-12 10:40 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# /etc/X11/xorg.conf (xorg X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
# (Type man /etc/X11/xorg.conf at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section ServerFlags
Option  NoTrapSignals true
EndSection

Section Files
FontPath/usr/share/fonts/X11/misc
FontPath/usr/X11R6/lib/X11/fonts/misc
FontPath/usr/share/fonts/X11/cyrillic
FontPath/usr/X11R6/lib/X11/fonts/cyrillic
FontPath/usr/share/fonts/X11/100dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/100dpi/:unscaled
FontPath/usr/share/fonts/X11/75dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/75dpi/:unscaled
FontPath/usr/share/fonts/X11/Type1
FontPath/usr/X11R6/lib/X11/fonts/Type1
FontPath/usr/share/fonts/X11/100dpi
FontPath/usr/X11R6/lib/X11/fonts/100dpi
FontPath/usr/share/fonts/X11/75dpi
FontPath/usr/X11R6/lib/X11/fonts/75dpi
# path to defoma fonts
FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
EndSection

Section Module
Loadi2c
Loadbitmap
Loadddc
Loaddri
Loadextmod
Loadfreetype
Loadglx
Loadint10
Loadtype1
Loadvbe
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  pc104
Option  XkbLayout ch
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/input/mice
Option  Protocol  ExplorerPS/2
Option  Emulate3Buttons   true
EndSection

Section Device
Identifier  S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA Controller 
(TwisterK)
Driver  savage
BusID   PCI:1:0:0
EndSection

Section Monitor
Identifier  Generic Monitor
Option  DPMS
HorizSync   28-51
VertRefresh 43-60
EndSection

Section Screen
Identifier  Default Screen
Device  S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA Controller 
(TwisterK)
Monitor Generic Monitor
DefaultDepth16
SubSection Display
Depth   1
Modes   1024x768
EndSubSection
SubSection Display
Depth   4
Modes   1024x768
EndSubSection
SubSection Display
Depth   8
Modes   1024x768
EndSubSection
SubSection Display
Depth   15
Modes   1024x768
EndSubSection
SubSection Display

Bug#428090: xorg: silence quilt next in xsfbs.mk

[Tormod Volden]

Package: xorg
Version: 1:7.2-3
Severity: minor
Tags: patch


When building any X package, quilt next is used as a probe in xsfbs.mk to see 
if there are any patches. This 
results in the first patch being listed, which is confusing and you might think 
it applies only one patch when you look 
at the build log. It should rather list all patches or none.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.21-1-486
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xorg depends on:
ii  gnome-terminal [x-terminal- 2.18.0-2 The GNOME 2 terminal emulator appl
ii  libgl1-mesa-glx 6.5.2-5  A free implementation of the OpenG
ii  libglu1-mesa6.5.2-5  The OpenGL utility library (GLU)
ii  type-handling [not+sparc]   0.2.21   dpkg architecture generation scrip
ii  xbase-clients   1:7.2.ds2-2  miscellaneous X clients
ii  xfonts-100dpi   1:1.0.0-3100 dpi fonts for X
ii  xfonts-75dpi1:1.0.0-375 dpi fonts for X
ii  xfonts-base 1:1.0.0-4standard fonts for X
ii  xfonts-scalable 1:1.0.0-6scalable fonts for X
ii  xkb-data0.9-4X Keyboard Extension (XKB) configu
ii  xorg-docs   1:1.4-2  Miscellaneous documentation for th
ii  xserver-xorg1:7.2-3  the X.Org X server
ii  xterm [x-terminal-emulator] 225-1X terminal emulator
ii  xutils  1:7.1.ds.3-1 X Window System utility programs

Versions of packages xorg recommends:
ii  libgl1-mesa-dri   6.5.2-5A free implementation of the OpenG

-- no debconf information
--- xsfbs.mk.orig   2007-04-24 05:24:11.0 +0200
+++ xsfbs.mk2007-06-08 22:25:05.0 +0200
@@ -141,7 +141,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo Couldn't find quilt. Please install it or add it to the 
build-depends for this package.; \
exit 1; \
fi; \
-   if quilt next; then \
+   if quilt next /dev/null; then \
  echo -n Applying patches...; \
  if quilt push -a -v $(STAMP_DIR)/log/patch 21; then \
echo successful.; \

Bug#423485: xserver-xorg-video-savage: segfault in savage_drv.so(SavageAdjustFrame+0x78)

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 1:2.1.2-5
Severity: normal

Trying to start an old q3demo, the X server crashed.

Backtrace:
0: /usr/bin/X(xf86SigHandler+0x81) [0x80c2511]
1: [0xb7fb7420]
2: /usr/lib/xorg/modules/drivers//savage_drv.so(SavageAdjustFrame+0x78) 
[0xb7c16
768]
3: /usr/lib/xorg/modules/drivers//savage_drv.so [0xb7c1d747]
4: /usr/lib/xorg/modules/drivers//savage_drv.so(SavageSwitchMode+0x60) 
[0xb7c1da
70]
5: /usr/bin/X [0x80f8163]
6: /usr/bin/X [0x80ca773]
7: /usr/bin/X(xf86SwitchMode+0xce) [0x80bf47e]
8: /usr/bin/X(VidModeSwitchMode+0x6d) [0x80c7c8d]
9: /usr/lib/xorg/modules/extensions//libextmod.so [0xb7cb2c4a]
10: /usr/bin/X [0x814bbce]
11: /usr/bin/X(Dispatch+0x19f) [0x8088cbf]
12: /usr/bin/X(main+0x495) [0x8070e05]
13: /lib/libc.so.6(__libc_start_main+0xdc) [0xb7dceebc]
14: /usr/bin/X(FontFileCompleteXLFD+0x1e9) [0x8070121]


-- Package-specific info:
Contents of /var/lib/x11/X.roster:
xserver-xorg

/etc/X11/X target does not match checksum in /var/lib/x11/X.md5sum.

X server symlink status:
lrwxrwxrwx 1 root root 13 2006-09-04 20:32 /etc/X11/X - /usr/bin/Xorg
-rwxr-xr-x 1 root root 1698800 2007-05-09 11:59 /usr/bin/Xorg

Contents of /var/lib/x11/xorg.conf.roster:
xserver-xorg

VGA-compatible devices on PCI bus:
01:00.0 VGA compatible controller: S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA 
Controller (TwisterK) (rev 01)

/etc/X11/xorg.conf does not match checksum in /var/lib/x11/xorg.conf.md5sum.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 2978 2006-09-04 21:00 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# /etc/X11/xorg.conf (xorg X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
# (Type man /etc/X11/xorg.conf at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section Files
FontPath/usr/share/fonts/X11/misc
FontPath/usr/X11R6/lib/X11/fonts/misc
FontPath/usr/share/fonts/X11/cyrillic
FontPath/usr/X11R6/lib/X11/fonts/cyrillic
FontPath/usr/share/fonts/X11/100dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/100dpi/:unscaled
FontPath/usr/share/fonts/X11/75dpi/:unscaled
FontPath/usr/X11R6/lib/X11/fonts/75dpi/:unscaled
FontPath/usr/share/fonts/X11/Type1
FontPath/usr/X11R6/lib/X11/fonts/Type1
FontPath/usr/share/fonts/X11/100dpi
FontPath/usr/X11R6/lib/X11/fonts/100dpi
FontPath/usr/share/fonts/X11/75dpi
FontPath/usr/X11R6/lib/X11/fonts/75dpi
# path to defoma fonts
FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
EndSection

Section Module
Loadi2c
Loadbitmap
Loadddc
Loaddri
Loadextmod
Loadfreetype
Loadglx
Loadint10
Loadtype1
Loadvbe
EndSection

Section InputDevice
Identifier  Generic Keyboard
Driver  kbd
Option  CoreKeyboard
Option  XkbRules  xorg
Option  XkbModel  pc104
Option  XkbLayout ch
EndSection

Section InputDevice
Identifier  Configured Mouse
Driver  mouse
Option  CorePointer
Option  Device/dev/input/mice
Option  Protocol  ExplorerPS/2
Option  Emulate3Buttons   true
EndSection

Section Device
Identifier  S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA Controller 
(TwisterK)
Driver  savage
BusID   PCI:1:0:0
EndSection

Section Monitor
Identifier  Generic Monitor
Option  DPMS
HorizSync   28-51
VertRefresh 43-60
EndSection

Section Screen
Identifier  Default Screen
Device  S3 Inc. VT8636A [ProSavage KN133] AGP4X VGA Controller 
(TwisterK)
Monitor Generic Monitor
DefaultDepth16
SubSection Display
Depth   1
Modes   1024x768
EndSubSection
SubSection Display
Depth   4
Modes   1024x768
EndSubSection
SubSection Display
Depth   8
Modes   1024x768
EndSubSection
SubSection Display
Depth   15
Modes   1024x768
   

Bug#423485: xserver-xorg-video-savage: full debug backtrace

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 1:2.1.2-5
Followup-For: Bug #423485

After installing the xserver-xorg-core-dbg, rebuilding 
xserver-xorg-video-savage with nostrip debug noopt,
adding NoTrapSignals to xorg.conf, 
and running ulimit -c unlimited before restarting gdm,
I got this more complete backtrace.
(gdb) bt full
#0  0xb7c05c44 in SavageDoAdjustFrame (pScrn=0x8207df8, x=0, y=0, crtc2=0) at 
../../src/savage_driver.c:3949
psav = (SavagePtr) 0x8208f80
currentMode = (DisplayModePtr) 0x0
address = 0
top = 0
left = 0
tile_height = 16
tile_size = 2048
#1  0xb7c05a96 in SavageAdjustFrame (scrnIndex=0, x=0, y=0, flags=0) at 
../../src/savage_driver.c:3903
pScrn = (ScrnInfoPtr) 0x8207df8
psav = (SavagePtr) 0x8208f80
#2  0xb7c05766 in SavageModeInit (pScrn=0x8207df8, mode=0x820a590) at 
../../src/savage_driver.c:3818
hwp = (vgaHWPtr) 0x82088a8
psav = (SavagePtr) 0x8208f80
width = 0
dclk = 25175
i = 0
j = 0
m = 0
n = 0
r = 0
tmp = 0 '\0'
new = (SavageRegPtr) 0x8209028
vganew = (vgaRegPtr) 0x8208be4
vgaCRIndex = 980
vgaCRReg = 981
vgaIOBase = 976
refresh = 0
newmode = 0
newrefresh = 0
#3  0xb7c05e6f in SavageSwitchMode (scrnIndex=0, mode=0x820a590, flags=0) at 
../../src/savage_driver.c:3993
pScrn = (ScrnInfoPtr) 0x8207df8
psav = (SavagePtr) 0x8208f80
success = 0
#4  0x080f8163 in xf86CursorSwitchMode (index=0, mode=0x820a590, flags=0) at 
../../../../hw/xfree86/ramdac/xf86Cursor.c:239
ret = 0
pScreen = (ScreenPtr) 0x0
ScreenPriv = (xf86CursorScreenPtr) 0x82230d0
#5  0x080ca773 in CMapSwitchMode (index=0, mode=0x820a590, flags=0) at 
../../../../hw/xfree86/common/xf86cmap.c:484
No locals.
#6  0x080bf47e in xf86SwitchMode (pScreen=0x820ac30, mode=0x820a590) at 
../../../../hw/xfree86/common/xf86Cursor.c:236
pScr = (ScrnInfoPtr) 0x8207df8
pCursorScreen = (ScreenPtr) 0x820ac30
Switched = 1
px = value optimized out
py = value optimized out
#7  0x080c7c8d in VidModeSwitchMode (scrnIndex=0, mode=0x820a590) at 
../../../../hw/xfree86/common/xf86VidMode.c:372
pScrn = (ScrnInfoPtr) 0x8207df8
pTmpMode = (DisplayModePtr) 0x820a3a0
retval = 136347128
#8  0xb7c9fc4a in ProcXF86VidModeSwitchToMode (client=0x84728a8) at 
../../../../../hw/xfree86/dixmods/extmod/xf86vmode.c:1255
stuff = (xXF86VidModeSwitchToModeReq *) 0xbf99e1a0
newstuff = {reqType = 120 'x', xf86vidmodeReqType = 141 '\215', length 
= 9, screen = 0, dotclock = 25175, hdisplay = 640, hsyncstart = 656, hsyncend = 
752, htotal = 800, hskew = 0, vdisplay = 480, vsyncstart = 490, vsyncend = 492, 
vtotal = 525, pad1 = 47051, flags = 10, reserved1 = 138881192, reserved2 = 
3214533096, reserved3 = 3083474372, privsize = 0}
mode = (pointer) 0x820a590
len = value optimized out
dotClock = 25175
ver = value optimized out
#9  0x0814bbce in XaceCatchExtProc (client=0x84728a8) at ../../Xext/xace.c:299
major = 135
ext = value optimized out
#10 0x08088cbf in Dispatch () at ../../dix/dispatch.c:457
result = value optimized out
client = (ClientPtr) 0x84728a8
nready = 0
start_tick = 6180
#11 0x08070e05 in main (argc=11, argv=0xbf99e744, envp=Cannot access memory at 
address 0x8
) at ../../dix/main.c:477
pScreen = value optimized out
i = value optimized out
error = -1080432780
xauthfile = value optimized out
alwaysCheckForInput = {0, 1}

(gdb) list
3944 * because we align the viewport to the width and height of one tile
3945 * we should update the locate of frame
3946 */
3947pScrn-frameX0 = left;
3948pScrn-frameY0 = top;
3949pScrn-frameX1 = left + currentMode-HDisplay - 1;
3950pScrn-frameY1 = top + currentMode-VDisplay - 1;
3951
3952if (psav-Chipset == S3_SAVAGE_MX) {
3953if (!crtc2) {

Bug#423485: (no subject)

[Tormod Volden]

I also tried launching q3demo from a console:
LIBGL_DEBUG=1 DISPLAY=:0 ./q3demo
and then the X server did not crash, only the q3demo program. See 
attached console screendump.
---
- Client Initialization Complete -
--- Common Initialization Complete ---
Opening IP socket: localhost:27960
Hostname: localhost
Alias: viki
Alias: viki
IP: 127.0.0.1
IP: 127.0.1.1
- R_Init -
loading libGL.so: Initializing OpenGL display
setting mode 3: 640 480
Using XFree86-VidModeExtension Version 2.2
XF86DGA Mouse (Version 2.0) initialized
XFree86-VidModeExtension Activated at 640x480
X Error of failed request:  BadValue (integer parameter out of range for 
operation)
Major opcode of failed request:  135 (XFree86-VidModeExtension)
Minor opcode of failed request:  10 (XF86VidModeSwitchToMode)
Value in failed request:  0x43
Serial number of failed request:  14
Current serial number in output stream:  16
[EMAIL PROTECTED]:/media/homes/sw/q3demo$
[EMAIL PROTECTED]:/media/homes/sw/q3demo$
[EMAIL PROTECTED]:/media/homes/sw/q3demo$

Bug#423485: xserver-xorg-video-savage: pScrn-currentMode is set to NULL

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 1:2.1.2+git20070512-0.1debug
Followup-For: Bug #423485

Playing around with gdb, I see that pScrn-currentMode has been set to 
NULL by xf86VidMode. If I manually set it to pScrn-modes:
(gdb) set pScrn-currentMode = pScrn-modes
the program will start and seems to run normally.

AFAICS the problem is that xf86VidMode sets it intentionally to NULL 
before calling xf86SwitchMode, and that it's then used as a 
pointer by SavageDoAdjustFrame inside the xf86SwitchMode call.

See the attachment for the gdb debug session.
1. At the time of the crash:

(gdb) print pScrn-currentMode
$1 = (DisplayModePtr) 0x0
(gdb) print pScrn-modes
$2 = (DisplayModePtr) 0x820a3a0
(gdb) print *pScrn
$3 = {driverVersion = 33619970, driverName = 0xb7bb15f0 savage, 
  pScreen = 0x820ac30, scrnIndex = 0, configured = 1, origIndex = 0, 
  imageByteOrder = 0, bitmapScanlineUnit = 32, bitmapScanlinePad = 32, 
  bitmapBitOrder = 0, numFormats = 0, formats = {{depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}, {depth = 0 '\0', 
  bitsPerPixel = 0 '\0', scanlinePad = 0 '\0'}}, fbFormat = {
depth = 16 '\020', bitsPerPixel = 16 '\020', scanlinePad = 32 ' '}, 
  bitsPerPixel = 16, pixmap24 = Pix24DontCare, depth = 16, 
  depthFrom = X_CONFIG, bitsPerPixelFrom = X_PROBED, weight = {red = 5, 
green = 6, blue = 5}, mask = {red = 63488, green = 2016, blue = 31}, 
  offset = {red = 11, green = 5, blue = 0}, rgbBits = 6, gamma = {red = 1, 
green = 1, blue = 1}, defaultVisual = 4, maxHValue = 16384, 
  maxVValue = 2048, virtualX = 1024, virtualY = 768, xInc = 8, 
  virtualFrom = X_PROBED, displayWidth = 1024, frameX0 = 0, frameY0 = 0, 
  frameX1 = 1023, frameY1 = 767, zoomLocked = 0, modePool = 0x0, 
  modes = 0x820a3a0, currentMode = 0x0, confScreen = 0x81f8a90, 
  monitor = 0x81f8ac8, display = 0x81fe7a0, entityList = 0x8207808, 
  numEntities = 1, widthmm = 0, heightmm = 0, xDpi = 96, yDpi = 96, 
  name = 0xb7bb1eba SAVAGE, driverPrivate = 0x8208f80, privates = 0x8206970, 
  drv = 0x8206948, module = 0x8208270, colorKey = 0, overlayFlags = 0, 
  chipset = 0xb7bb172e Twister, ramdac = 0x0, clockchip = 0x0, 
  progClock = 1, numClocks = 0, clock = {0 repeats 128 times}, 
  videoRam = 16384, biosBase = 0, memPhysBase = 3893362688, fbOffset = 0, 
  domainIOBase = 0, memClk = 0, textClockFreq = 0, flipPixels = 0, 
  options = 0x8207dc8, chipID = 0, chipRev = 0, racMemFlags = 0, 
  racIoFlags = 0, access = 0x8206150, CurrentAccess = 0x81e8778, 
  resourceType = MEM_IO, busAccess = 0x8207c58, vtSema = 1, pixmapPrivate = {
ptr = 0x0, val = 0, uval = 0, fptr = 0}, silkenMouse = 0, 
  clockRanges = 0x8209830, adjustFlags = 1, reservedInt = {
0 repeats 16 times}, entityInstanceList = 0x8207d18, reservedPtr = {
0x0 repeats 15 times}, Probe = 0xb7b98910 SavageProbe, 
  PreInit = 0xb7b991a1 SavagePreInit, 
  ScreenInit = 0xb7b9f70b SavageScreenInit, 
  SwitchMode = 0x80ca730 CMapSwitchMode, 
  AdjustFrame = 0x80d7140 xf86XVAdjustFrame, 
  EnterVT = 0xb7c1fc40 glxDRIEnterVT, LeaveVT = 0xb7c1fbe0 glxDRILeaveVT, 
  FreeScreen = 0, ValidMode = 0xb7ba08e5 SavageValidMode, 
  EnableDisableFBAccess = 0x80f85d0 xf86CursorEnableDisableFBAccess, 
  SetDGAMode = 0x80cb940 CMapSetDGAMode, 
  ChangeGamma = 0x80cb4c0 CMapChangeGamma, 
  PointerMoved = 0x80be320 xf86PointerMoved, PMEvent = 0, HandleMessage = 0, 
  DPMSSet = 0xb7ba2f8f SavageDPMS, 
  LoadPalette = 0xb7ba20e5 SavageLoadPalette, SetOverscan = 0, 
  DriverFunc = 0, reservedFuncs = {0 repeats 11 times}}

2. If I set a breakpoint and set the currentMode manually
(gdb) set pScrn-currentMode = pScrn-modes
before entering SavageDoAdjustFrame, the program runs.


3. Here I look at currentMode before starting the program and set
a watchpoint to find out where it is being changed.

(gdb) print xf86Screens[0]-currentMode
$5 = (DisplayModePtr) 0x820a3a0
(gdb) print *xf86Screens[0]-currentMode
$6 = {prev = 0x820a900, next = 0x820a440, name = 0x8209dc8 1024x768, 
  status = MODE_OK, type = 48, Clock = 65000, HDisplay = 1024, 
  HSyncStart = 1048, HSyncEnd = 1184, HTotal = 1344, HSkew = 0, 
  VDisplay = 768, VSyncStart = 771, VSyncEnd = 777, VTotal = 806, VScan = 0, 
  Flags = 10, ClockIndex = -1, SynthClock = 65000, CrtcHDisplay = 1024, 
  CrtcHBlankStart = 1024, CrtcHSyncStart = 1048, CrtcHSyncEnd = 1184, 
  CrtcHBlankEnd = 1344, CrtcHTotal = 1344, CrtcHSkew = 0, CrtcVDisplay = 768, 
  CrtcVBlankStart = 768, CrtcVSyncStart = 771, CrtcVSyncEnd = 777, 
  CrtcVBlankEnd = 806, CrtcVTotal = 806, CrtcHAdjusted = 0, CrtcVAdjusted = 

Bug#423485: xserver-xorg-video-savage: patch to set currentMode after switching

[Tormod Volden]

Package: xserver-xorg-video-savage
Version: 1:2.1.2+git20070512-0.2debug
Followup-For: Bug #423485

The attached patch fixes (or works around) the problem by setting currentMode 
to the new mode as 
soon as the mode switching has occured, and before SavageAdjustFrame is called.

There are probably better ways to fix this. It seems like the pScrn-frameX? 
adjustment is done 
in xf86SwitchMode as well, so maybe it could be taken out from 
SavageDoAdjustFrame which then 
would not need the currentMode.
Index: xserver-xorg-video-savage-2.1.2+git20070512/src/savage_driver.c
===
--- xserver-xorg-video-savage-2.1.2+git20070512.orig/src/savage_driver.c	2007-05-13 00:58:41.0 +0200
+++ xserver-xorg-video-savage-2.1.2+git20070512/src/savage_driver.c	2007-05-13 01:16:25.0 +0200
@@ -3547,6 +3547,7 @@
 
 /* do it! */
 SavageWriteMode(pScrn, vganew, new, TRUE);
+	pScrn-currentMode = mode;
 
 if (psav-FBStart2nd) {
 	SavageStreamsOn(pScrn);
@@ -3809,6 +3810,7 @@
 
 /* do it! */
 SavageWriteMode(pScrn, vganew, new, TRUE);
+pScrn-currentMode = mode;
 
 if (psav-FBStart2nd) {
 SavageStreamsOn(pScrn);

Bug#276269: xserver-xorg-video-savage: worksforme

[Tormod Volden]

Package: xserver-xorg-video-savage
Followup-For: Bug #276269

Thanks for the reminder. No, it doesn't crash any longer, so we can 
safely close this bug.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#386191: xserver-xorg: -latin1 is already stripped away

[Tormod Volden]

Package: xserver-xorg
Version: 1:7.0.22
Followup-For: Bug #386191

Christian, -latin1 should already have been stripped off, so that sg 
would match. The problem is that the stripping itself is broken, see 
my patch.
--- xserver-xorg.config.orig2006-06-12 05:46:03.0 +0200
+++ xserver-xorg.config 2006-09-06 19:39:36.0 +0200
@@ -1765,7 +1765,7 @@
 
   db_get debian-installer/keymap || debug_report_status db_get 
debian-installer/keymap
   DI_KEYMAP=${RET##mac-usb-}
-  DI_KEYMAP=${DI_KEYMAP##-latin1}
+  DI_KEYMAP=${DI_KEYMAP%%-latin1}
 
   case $DI_KEYMAP in
 be2) XMAP=be;;

Bug#386191: xserver-xorg: picked us keyboard layout instead of ch

[Tormod Volden]

Package: xserver-xorg
Version: 1:7.0.22
Severity: normal

I chose English as language, Switzerland as location, and Swiss-German 
as keyboard layout during the GUI debian-installer. Afterwards, the 
xorg.conf had keyboard Layout us.

Here is from the installer/syslog file:
Sep  4 18:13:51 in-target: xserver-xorg config warning: failed to infer 
keyboard layout from layout/lang
Sep  4 18:13:51 in-target:'sg-latin1--en_US'

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-2-486
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages xserver-xorg depends on:
ii  debconf   1.5.3  Debian configuration management sy
ii  x11-common1:7.0.22   X Window System (X.Org) infrastruc
ii  xbase-clients 1:7.1.ds-3 miscellaneous X clients
ii  xkb-data  0.8-7  X Keyboard Extension (XKB) configu
ii  xserver-xorg-core 1:1.0.2-9  X.Org X server -- core server
ii  xserver-xorg-input-al 1:7.0.22   the X.Org X server -- input driver
ii  xserver-xorg-input-ev 1:1.0.0.5-2X.Org X server -- evdev input driv
ii  xserver-xorg-input-kb 1:1.0.1.3-2X.Org X server -- keyboard input d
ii  xserver-xorg-input-mo 1:1.0.4-3  X.Org X server -- mouse input driv
ii  xserver-xorg-video-al 1:7.0.22   the X.Org X server -- output drive
ii  xserver-xorg-video-ap 1:1.0.1.5-2X.Org X server -- APM display driv
ii  xserver-xorg-video-ar 1:0.5.0.5-2X.Org X server -- ark display driv
ii  xserver-xorg-video-at 1:6.5.8.0-1X.Org X server -- ATI display driv
ii  xserver-xorg-video-ch 1:1.0.1.3-3X.Org X server -- Chips display dr
ii  xserver-xorg-video-ci 1:1.0.0.5-2X.Org X server -- Cirrus display d
ii  xserver-xorg-video-cy 1:1.0.0.5-2X.Org X server -- Cyrix display dr
ii  xserver-xorg-video-du 1:0.1.0.5-2X.Org X server -- dummy display dr
ii  xserver-xorg-video-fb 1:0.1.0.5-2X.Org X server -- fbdev display dr
ii  xserver-xorg-video-gl 1:1.0.1.3-3X.Org X server -- Glint display dr
ii  xserver-xorg-video-i1 1:1.1.0.5-2X.Org X server -- i128 display dri
ii  xserver-xorg-video-i7 1:1.0.0.5-2X.Org X server -- i740 display dri
ii  xserver-xorg-video-i8 1:1.5.1.0-2X.Org X server -- Intel i8xx, i9xx
ii  xserver-xorg-video-im 1:1.0.0.5-2X.Org X server -- IMSTT display dr
ii  xserver-xorg-video-mg 1:1.2.1.3.dfsg.1-2 X.Org X server -- MGA display driv
ii  xserver-xorg-video-ne 1:1.0.0.5-2X.Org X server -- Neomagic display
ii  xserver-xorg-video-ne 1:0.1.4.1-3X.Org X server -- Newport display 
ii  xserver-xorg-video-ns 1:2.7.6.5-2X.Org X server -- NSC display driv
ii  xserver-xorg-video-nv 1:1.0.1.5-2X.Org X server -- NV display drive
ii  xserver-xorg-video-re 1:4.0.1.3.dfsg.1-2 X.Org X server -- Rendition displa
ii  xserver-xorg-video-s3 1:1.8.6.5-2X.Org X server -- S3 ViRGE display
ii  xserver-xorg-video-sa 1:2.0.2.3-4X.Org X server -- Savage display d
ii  xserver-xorg-video-si 1:1.3.1.5-3X.Org X server -- SiliconMotion di
ii  xserver-xorg-video-si 1:0.8.1.3-2X.Org X server -- SiS display driv
ii  xserver-xorg-video-si 1:0.7.1.3-2X.Org X server -- SiS USB display 
ii  xserver-xorg-video-td 1:1.1.1.3-3X.Org X server -- tdfx display dri
ii  xserver-xorg-video-tg 1:1.0.0.5-3X.Org X server -- TGA display driv
ii  xserver-xorg-video-tr 1:1.0.1.2-2X.Org X server -- Trident display 
ii  xserver-xorg-video-ts 1:1.0.0.5-2X.Org X server -- Tseng display dr
ii  xserver-xorg-video-v4 0.0.1.5-1  X.Org X server -- Video 4 Linux di
ii  xserver-xorg-video-ve 1:1.0.1.3-2X.Org X server -- VESA display dri
ii  xserver-xorg-video-vg 1:4.0.0.5-2X.Org X server -- VGA display driv
ii  xserver-xorg-video-vi 1:0.1.33.2-3   X.Org X server -- VIA display driv
ii  xserver-xorg-video-vm 1:10.11.1.3-2  X.Org X server -- VMware display d
ii  xserver-xorg-video-vo 1:1.0.0.5-2X.Org X server -- Voodoo display d

Versions of packages xserver-xorg recommends:
ii  discover1  1.7.18hardware identification system
ii  laptop-detect  0.12.1attempt to detect a laptop
pn  mdetectnone(no description available)
ii  xresprobe  0.4.23debian1 X Resolution Probe

-- debconf information:
  xserver-xorg/multiple_possible_x-drivers:
  xserver-xorg/config/monitor/use_sync_ranges: true
  xserver-xorg/config/inputdevice/mouse/port: /dev/input/mice
  xserver-xorg/config/doublequote_in_string_error:
  xserver-xorg/config/monitor/screen-size: 17 inches (430 mm)
  shared/default-x-server: xserver-xorg
  xserver-xorg/autodetect_monitor: true
  xserver-xorg/config/inputdevice/mouse/protocol: 

Bug#276269: bt full

[Tormod Volden]

Below is the bt full output. (sorry for that -7 thing, just copied it blindly 
from another bug).
I love that beCareful = 0 :)

Signal handler ? Is it missing because the server had the NoTrapSignals flag ?
Tormod



(gdb) bt full
#0  0x0838edc6 in XAAMoveDWORDS (dest=0x402a92f0, src=0x41400ff6, dwords=3)
   at xaaImage.c:58
No locals.
#1  0x0838f5fb in XAAWritePixmap (pScrn=0x8b6e5f8, x=0, y=0, w=381, h=0, 
   src=0x41400d06 , srcwidth=768, rop=3, planemask=4294967295, trans=-1, 
   bpp=16, depth=16) at xaaImage.c:277

   infoRec = 0x8b9c0a8
   dwords = 191
   skipleft = 0
   Bpp = 2
   beCareful = 0
   PlusOne = 0
#2  0x0837f5a5 in XAADoImageWrite (pSrc=0x8b70ee8, pDst=0x8bc38b8, 
   pGC=0x8cca058, prgnDst=0xb710, pptSrc=0xb6a8) at xaaCpyArea.c:216

   srcwidth = 768
   psrcBase = (unsigned char *) 0x413b9000 
   srcPntr = (unsigned char *) 0x413bf906 
   pbox = 0xb710
   nbox = 1
   infoRec = 0x8b9c0a8
   Bpp = 2
#3  0x0837eb7e in XAABitBlt (pSrcDrawable=0x8b70ee8, pDstDrawable=0x8bc38b8, 
   pGC=0x8cca058, srcx=3, srcy=35, width=381, height=349, dstx=0, dsty=0, 
   doBitBlt=0x837f457 XAADoImageWrite, bitPlane=0) at xaaBitBlt.c:201

   prgnSrcClip = 0x0
   prgnExposed = 0x0
   freeSrcClip = 0
   rgnDst = {extents = {x1 = 0, y1 = 0, x2 = 381, y2 = 349}, data = 0x0}
   pptSrc = 0xb6a8
   ppt = 0xb6ac
   origDest = {x = 0, y = 0}
   pbox = 0xb718
   fastBox = {x1 = 0, y1 = 0, x2 = 381, y2 = 349}
   i = -1
   dx = 3
   dy = 35
   numRects = 1
   origSource = {x = 3, y = 35, width = 381, height = 349}
   fastClip = 1
   fastExpose = 1
#4  0x0837ef12 in XAACopyArea (pSrcDrawable=0x8b70ee8, pDstDrawable=0x8bc38b8, 
   pGC=0x8cca058, srcx=3, srcy=35, width=381, height=349, dstx=0, dsty=0)

   at xaaCpyArea.c:53
   infoRec = 0x8b9c0a8
#5  0x0863b69f in miSpriteCopyArea (pSrc=0x8b70ee8, pDst=0x8bc38b8, 
   pGC=0x8cca058, srcx=3, srcy=35, w=381, h=349, dstx=0, dsty=0)

   at misprite.c:1190
   rgn = 0x8b70ee8
   pScreenPriv = 0x8b71bc8
   pGCPrivate = 0x8cca100
   oldFuncs = (GCFuncs *) 0x8aea480
#6  0x08642283 in fbShmPutImage (dst=0x8bc38b8, pGC=0x8cca058, depth=16, 
   format=2, w=384, h=384, sx=3, sy=35, sw=381, sh=349, dx=0, dy=0, 
   data=0x413b9000 ) at shm.c:546

   pPixmap = 0x8b70ee8
#7  0x08643afb in ProcShmPutImage (client=0x8cc8958) at shm.c:875
   pGC = 0x8cca058
   pDraw = 0x8bc38b8
   length = 768
   shmdesc = 0x8cc8350
   stuff = (xShmPutImageReq *) 0x8ccb1d8
#8  0x08644888 in ProcShmDispatch (client=0x8cc8958) at shm.c:1108
   stuff = (xReq *) 0x0
#9  0x084de350 in Dispatch () at dispatch.c:450
   clientReady = (int *) 0xb904
   result = 40
   client = 0x8cc8958
   nready = 0
   icheck = (HWEventQueuePtr *) 0x8b55bc8
   start_tick = 6520
#10 0x084f58c4 in main (argc=5, argv=0xbdc4, envp=0xbddc) at main.c:469
   i = 1
   j = 2
   k = 2
   error = -1073742396
   xauthfile = 0xbfcf /root/.Xauthority
   alwaysCheckForInput = {0, 1}
(gdb) 

Bug#180107: narrow down hacks

[Tormod Volden]

As an aside...

I find it's better to write infinite loops in the shell such that they
terminate when the command of interest fails:
 



Just while we are aside :)
Yes, that's better programming practice in general.
However, in this case the script will be killed anyway, when the server 
crashes.

(Assuming it's run as intended from within the session, of course)

And if the user during his session temporarily stops the
screensaver for later to resume it, the script will keep on going.
With your version, the script stops when the screensaver stops.

Tormod

Bug#276269: backtrace

[Tormod Volden]

I finally found the core dump in /etc/X11. I had been looking in $PWD 
and / and $HOME, searched the /var and /tmp and /root trees...



# gdb /usr/X11R6/bin/XFree86-debug /etc/X11/core
GNU gdb 6.1-debian
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain 
conditions.

Type show copying to see the conditions.
There is absolutely no warranty for GDB.  Type show warranty for details.
This GDB was configured as i386-linux...Using host libthread_db 
library /lib/

tls/libthread_db.so.1.

Core was generated by `/usr/bin/X11/X -dpi 100 -nolisten tcp'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /usr/lib/libfreetype.so.6...done.
Loaded symbols for /usr/lib/libfreetype.so.6
Reading symbols from /usr/lib/libz.so.1...done.
Loaded symbols for /usr/lib/libz.so.1
Reading symbols from /lib/libm.so.6...done.
Loaded symbols for /lib/libm.so.6
Reading symbols from /lib/libc.so.6...done.
Loaded symbols for /lib/libc.so.6
Reading symbols from /lib/ld-linux.so.2...done.
Loaded symbols for /lib/ld-linux.so.2
#0  0x0838edc6 in XAAMoveDWORDS (dest=0x402a92f0, src=0x41400ff6, dwords=3)
   at xaaImage.c:58
58  xaaImage.c: No such file or directory.
   in xaaImage.c
(gdb) bt  
#0  0x0838edc6 in XAAMoveDWORDS (dest=0x402a92f0, src=0x41400ff6, dwords=3)

   at xaaImage.c:58
#1  0x0838f5fb in XAAWritePixmap (pScrn=0x8b6e5f8, x=0, y=0, w=381, h=0,
   src=0x41400d06 , srcwidth=768, rop=3, planemask=4294967295, trans=-1,
   bpp=16, depth=16) at xaaImage.c:277
#2  0x0837f5a5 in XAADoImageWrite (pSrc=0x8b70ee8, pDst=0x8bc38b8,
   pGC=0x8cca058, prgnDst=0xb710, pptSrc=0xb6a8) at 
xaaCpyArea.c:216
#3  0x0837eb7e in XAABitBlt (pSrcDrawable=0x8b70ee8, 
pDstDrawable=0x8bc38b8,

   pGC=0x8cca058, srcx=3, srcy=35, width=381, height=349, dstx=0, dsty=0,
   doBitBlt=0x837f457 XAADoImageWrite, bitPlane=0) at xaaBitBlt.c:201
#4  0x0837ef12 in XAACopyArea (pSrcDrawable=0x8b70ee8, 
pDstDrawable=0x8bc38b8,

   pGC=0x8cca058, srcx=3, srcy=35, width=381, height=349, dstx=0, dsty=0)
   at xaaCpyArea.c:53
#5  0x0863b69f in miSpriteCopyArea (pSrc=0x8b70ee8, pDst=0x8bc38b8,
   pGC=0x8cca058, srcx=3, srcy=35, w=381, h=349, dstx=0, dsty=0)
   at misprite.c:1190
#6  0x08642283 in fbShmPutImage (dst=0x8bc38b8, pGC=0x8cca058, depth=16,
   format=2, w=384, h=384, sx=3, sy=35, sw=381, sh=349, dx=0, dy=0,
   data=0x413b9000 ) at shm.c:546
#7  0x08643afb in ProcShmPutImage (client=0x8cc8958) at shm.c:875
#8  0x08644888 in ProcShmDispatch (client=0x8cc8958) at shm.c:1108
#9  0x084de350 in Dispatch () at dispatch.c:450
#10 0x084f58c4 in main (argc=5, argv=0xbdc4, envp=0xbddc) at 
main.c:469


(gdb) bt full -7
#4  0x0837ef12 in XAACopyArea (pSrcDrawable=0x8b70ee8, 
pDstDrawable=0x8bc38b8,

   pGC=0x8cca058, srcx=3, srcy=35, width=381, height=349, dstx=0, dsty=0)
   at xaaCpyArea.c:53
   infoRec = 0x8b9c0a8
#5  0x0863b69f in miSpriteCopyArea (pSrc=0x8b70ee8, pDst=0x8bc38b8,
   pGC=0x8cca058, srcx=3, srcy=35, w=381, h=349, dstx=0, dsty=0)
   at misprite.c:1190
   rgn = 0x8b70ee8
   pScreenPriv = 0x8b71bc8
   pGCPrivate = 0x8cca100
   oldFuncs = (GCFuncs *) 0x8aea480
#6  0x08642283 in fbShmPutImage (dst=0x8bc38b8, pGC=0x8cca058, depth=16,
   format=2, w=384, h=384, sx=3, sy=35, sw=381, sh=349, dx=0, dy=0,
   data=0x413b9000 ) at shm.c:546
   pPixmap = 0x8b70ee8
#7  0x08643afb in ProcShmPutImage (client=0x8cc8958) at shm.c:875
   pGC = 0x8cca058
   pDraw = 0x8bc38b8
   length = 768
   shmdesc = 0x8cc8350
   stuff = (xShmPutImageReq *) 0x8ccb1d8
#8  0x08644888 in ProcShmDispatch (client=0x8cc8958) at shm.c:1108
   stuff = (xReq *) 0x0
---Type return to continue, or q return to quit---
#9  0x084de350 in Dispatch () at dispatch.c:450
   clientReady = (int *) 0xb904
   result = 40
   client = 0x8cc8958
   nready = 0
   icheck = (HWEventQueuePtr *) 0x8b55bc8
   start_tick = 6520
#10 0x084f58c4 in main (argc=5, argv=0xbdc4, envp=0xbddc) at 
main.c:469

   i = 1
   j = 2
   k = 2
   error = -1073742396
   xauthfile = 0xbfcf /root/.Xauthority
   alwaysCheckForInput = {0, 1}
(gdb)

Bug#276269: xserver-xfree86-dbg: the bumps xscreensaver hack crashes the xserver

[Tormod Volden]

Subject: xserver-xfree86-dbg: bumps xscreensaver hack crashes xserver
Package: xserver-xfree86-dbg
Version: 4.3.0.dfsg.1-4
Severity: normal

*** Please type your report below this line ***

Running the bumps from the xscreensaver packages crashes the xserver,
as soon as the ball bumps into the left edge of the screen. Crashes
with /usr/lib/xscreensaver/bumps -root. Without -root is fine.
Running in Xnest is fine.

I have tried different servers, including xserver-xfree86-dbg 4.3.0.dfsg.1-8
and I have tried with both kernel 2.6.8 and 2.4.27.

There is no error messages, I have tried to get a backtrace, but with
no luck. I turn off gdm, runs ulimit -c unlimited and startx xterm
The X just crashes caught SEGV, aborting. I have tried enabling
NoTrapSignals in which case it all freezes, something the power button
still works and triggers shutdown, other times it is completely frozen,
and I have to cycle power. Running as root does not help.

Is there anything else I can try in order to get a backtrace ?

Tormod


-- Package-specific info:
Contents of /var/lib/xfree86/X.roster:
xserver-xfree86
xserver-xfree86-dbg

/etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum.

X server symlink status:
lrwxrwxrwx1 root root   26 Oct 10 16:25 /etc/X11/X -
/usr/bin/X11/XFree86-debug
-rwxr-xr-x1 root root 137297758 May 29 14:32
/usr/bin/X11/XFree86-debug

Contents of /var/lib/xfree86/XF86Config-4.roster:
xserver-xfree86
xserver-xfree86-dbg

VGA-compatible devices on PCI bus:
:01:00.0 VGA compatible controller: S3 Inc. VT8636A [ProSavage
KN133] AGP4X VGA Controller (TwisterK) (rev 01)
:01:00.0 Class 0300: 5333:8d02 (rev 01)

/etc/X11/XF86Config-4 does not match checksum in
/var/lib/xfree86/XF86Config-4.md5sum.

XFree86 X server configuration file status:
-rw-r--r--1 root root12506 Oct 10 02:25
/etc/X11/XF86Config-4

Contents of /etc/X11/XF86Config-4:
Section ServerLayout
Identifier XFree86 Configured
Screen  0  Screen0 0 0
InputDeviceKeyboard0 CoreKeyboard
InputDevicePS/2 Mouse CorePointer
# Serial Mouse not detected
# USB Mouse not detected
EndSection

Section ServerFlags
Option AllowMouseOpenFail  true
Option  NoPMtrue
EndSection

Section Files
RgbPath  /usr/X11R6/lib/X11/rgb
#   ModulePath   /usr/X11R6/lib/modules
FontPath /usr/X11R6/lib/X11/fonts/misc:unscaled
FontPath /usr/X11R6/lib/X11/fonts/misc
FontPath /usr/X11R6/lib/X11/fonts/75dpi:unscaled
FontPath /usr/X11R6/lib/X11/fonts/75dpi
FontPath /usr/X11R6/lib/X11/fonts/100dpi:unscaled
FontPath /usr/X11R6/lib/X11/fonts/100dpi
FontPath /usr/X11R6/lib/X11/fonts/Speedo
FontPath /usr/X11R6/lib/X11/fonts/PEX
# Additional fonts: Locale, Gimp, TTF...
FontPath /usr/X11R6/lib/X11/fonts/cyrillic
#   FontPath /usr/X11R6/lib/X11/fonts/latin2/75dpi
#   FontPath /usr/X11R6/lib/X11/fonts/latin2/100dpi
# True type and type1 fonts are also handled via xftlib, see
/etc/X11/XftConfig!
FontPath /usr/X11R6/lib/X11/fonts/Type1
FontPath /usr/share/fonts/ttf/western
FontPath /usr/share/fonts/ttf/decoratives
FontPath /usr/share/fonts/truetype
FontPath /usr/share/fonts/truetype/openoffice
FontPath /usr/share/fonts/truetype/ttf-bitstream-vera
FontPath /usr/share/fonts/latex-ttf-fonts
FontPath /usr/X11R6/lib/X11/fonts/defoma/CID
FontPath /usr/X11R6/lib/X11/fonts/defoma/TrueType
EndSection

Section Module
Load  ddc  # ddc probing of monitor
Load  GLcore
Load  dbe
Load  dri
Load  drm
Load  extmod
Load  glx
Load  bitmap # bitmap-fonts
Load  speedo
Load  type1
Load  freetype
Load  record
EndSection

Section InputDevice
Identifier  Keyboard0
Driver  keyboard
Option  CoreKeyboard
Option XkbRules xfree86
Option XkbModel pc105
Option XkbLayout us

EndSection

Section InputDevice
Identifier  Serial Mouse
Driver  mouse
Option  Protocol Microsoft
Option  Device /dev/ttyS0
Option  Emulate3Buttons true
Option  Emulate3Timeout 70
Option  SendCoreEvents  true
EndSection

Section InputDevice
Identifier  PS/2 Mouse
Driver  mouse
Option  Protocol auto
Option  ZAxisMapping  4 5
Option  Device /dev/psaux
Option  Emulate3Buttons true
Option  Emulate3Timeout 70
Option  SendCoreEvents  true
EndSection

Section InputDevice
Identifier  USB Mouse
Driver  mouse
Option  Device/dev/input/mice
Option  SendCoreEvents  true
Option  

Bug#180107: narrow down hacks

[Tormod Volden]

It would be helpful if you could narrow it down to at least one
problematic mode, though I freely admit that that could be sort of tedious.


Just my $0.02, to narrow down the guilty hack/mode, I find this useful:

while true ; do xscreensaver-command -next ; sleep 3 ; ps lax  
/var/tmp/lastscreensaverhack ; sleep 57 ; done


And leave it until it crashes, check /var/tmp/lastscreensaverhack 
afterwards. Maybe xscreensaver-command -watch can be handy too.


Myself, I have the bumps mode crashing the xserver, but I am not sure 
who to blame for it. Right now I am running xserver-xfree86-dri-trunk 
and savage snapshots, however I think it was crashing when I used the 
stock 4.3.0.dfsg.1-4 also.


Tormod

Bug#262111: ppc still crashes

[Tormod Volden]

I get the same crash (and xf86XVCopyYUV12ToPacked unresolved) on my 
fresh sarge powerpc. It has xserver-xfree86 4.3.0.dfsg.1-8 which I 
thought included a fix. Is the fix only for i386 ?


Best regards,
Tormod Volden

Bug#262111: WFM

[Tormod Volden]

Ok, now it works, after a reboot.
I had restarted the X server (obviously, as it kept crashing) since I 
upgraded

to xserver-xfree86-4.3.0.dfsg.1-8, but I didn't reboot before now.

Sorry for the noise.
Tormod

ps. Sarge really rocks on this old beige g3!