Re: [ANNOUNCE] xorg-server 1.6.1.902
On Tue, 2009-06-30 at 13:04 -0700, Ian Romanick wrote: Michel Dänzer wrote: On Mon, 2009-06-29 at 16:03 -0700, Keith Packard wrote: Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, [...] How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. You rejected backports before based on breaking ABI. Don't get me wrong, I like the functionality those DRI2 changes fix, but surely they could have been done without breaking about every binary interface involved. If the video driver ABI won't be restored, this Actually, the bug in question could not. This was discussed quite a bit on the mailing list and on IRC. The original DRI2 interface was deficient and could not be made to work. So I fixed it. should be reflected by bumping its major version, and the changes breaking it should wait for the next major release like other such changes. The change is in the DRI2 interface, and that version was changed. Without the corresponding updates the only thing you lose is DRI2. Reverting to DRI1 should still work. Since this affects only the Intel driver, and we will have a fixed driver release around the same time as the X server release, I don't think this is a catastrophic problem. You're probably right, glad it's not really an ABI breakage after all. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Thu, 2009-07-02 at 12:48 +0200, Michel Dänzer wrote: You're probably right, glad it's not really an ABI breakage after all. Did you see the patch I proposed to fix the ABI breakage and provide both interfaces? Testing would be greatly appreciated as I only have Intel hardware these days... -- keith.pack...@intel.com signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Thu, 2009-07-02 at 09:27 -0700, Keith Packard wrote: On Thu, 2009-07-02 at 12:48 +0200, Michel Dänzer wrote: You're probably right, glad it's not really an ABI breakage after all. Did you see the patch I proposed to fix the ABI breakage and provide both interfaces? Testing would be greatly appreciated as I only have Intel hardware these days... I'm not affected by the problem, you should ask the Debian users of your driver for testing. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
Le jeudi 02 juillet 2009 à 09:27 -0700, Keith Packard a écrit : On Thu, 2009-07-02 at 12:48 +0200, Michel Dänzer wrote: You're probably right, glad it's not really an ABI breakage after all. Did you see the patch I proposed to fix the ABI breakage and provide both interfaces? Testing would be greatly appreciated as I only have Intel hardware these days... I'll backport the patch to Gentoo ASAP for some wider testing. Thanks for the patch. Rémi ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Tue, 2009-06-30 at 07:57 +0200, Rémi Cardona wrote: Le 30/06/2009 01:03, Keith Packard a écrit : Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, I'll push this out as 1.6.2 shortly. This bug [1] is probably worth waiting for, as I've only been tracking the nominations page with our packages. So, one of the commits since Eamon's xace: Fix a bad device access hook call. seems to have broken KMS somehow. Could I get you to bisect for the problem? (it works for me...) -- keith.pack...@intel.com signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Tue, 2009-06-30 at 07:45 +0200, Rémi Cardona wrote:
Le 30/06/2009 01:03, Keith Packard a écrit :
Kristian Høgsberg (1):
Support setTexBuffer2 in AIGLX.
Keith,
That patch requires either some #ifdefs to make it build with mesa 7.4,
or mesa's minimum version needs to be pushed to 7.5 in configure.ac.
How about this (untested) patch?
commit a7a93c12f91e0de72868f17a555215f1795d9e2f
Author: Keith Packard kei...@keithp.com
Date: Mon Jun 29 23:18:55 2009 -0700
Build against DRI_TEX_BUFFER_VERSION 1
setTexBuffer2 isn't present in this version of the structure, so don't try
to call it.
Signed-off-by: Keith Packard kei...@keithp.com
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 0b64298..836fea4 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -222,12 +222,15 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
if (texBuffer == NULL)
return Success;
+#if __DRI_TEX_BUFFER_VERSION = 2
if (texBuffer-base.version = 2 texBuffer-setTexBuffer2 != NULL) {
(*texBuffer-setTexBuffer2)(context-driContext,
glxPixmap-target,
glxPixmap-format,
drawable-driDrawable);
-} else {
+} else
+#endif
+{
texBuffer-setTexBuffer(context-driContext,
glxPixmap-target,
drawable-driDrawable);
--
keith.pack...@intel.com
signature.asc
Description: This is a digitally signed message part
___
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Mon, 2009-06-29 at 16:03 -0700, Keith Packard wrote: Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, [...] How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. You rejected backports before based on breaking ABI. Don't get me wrong, I like the functionality those DRI2 changes fix, but surely they could have been done without breaking about every binary interface involved. If the video driver ABI won't be restored, this should be reflected by bumping its major version, and the changes breaking it should wait for the next major release like other such changes. -- Earthling Michel Dänzer |http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Mon, 29 Jun 2009 23:20:03 -0700 Keith Packard kei...@keithp.com wrote: On Tue, 2009-06-30 at 07:45 +0200, Rémi Cardona wrote: Le 30/06/2009 01:03, Keith Packard a écrit : Kristian Høgsberg (1): Support setTexBuffer2 in AIGLX. Keith, That patch requires either some #ifdefs to make it build with mesa 7.4, or mesa's minimum version needs to be pushed to 7.5 in configure.ac. How about this (untested) patch? commit a7a93c12f91e0de72868f17a555215f1795d9e2f Author: Keith Packard kei...@keithp.com Date: Mon Jun 29 23:18:55 2009 -0700 Build against DRI_TEX_BUFFER_VERSION 1 setTexBuffer2 isn't present in this version of the structure, so don't try to call it. Mail client munged it, but after hand-applying it, looks good here. Up and running on 1.6.1.902 and intel-2.7.99.901 -- thanks! -RW signature.asc Description: PGP signature ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Tue, 2009-06-30 at 08:46 +0200, Michel Dänzer wrote: How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. I've read the reports, and I'm treating this as a bug at this point -- I need to see more information about how the ABI is broken so we can figure out how to fix it. You rejected backports before based on breaking ABI. Yup, let's figure out how to fix it. This ABI breakage is unintentional, I believe. -- keith.pack...@intel.com signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
Keith Packard a écrit : Could I get you to bisect for the problem? (it works for me...) It works for me as well unfortunately, I'll help the user to get the bisect ASAP. Thanks -- Rémi Cardona LRI, INRIA remi.card...@lri.fr r...@gentoo.org ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
2009/6/30 Keith Packard kei...@keithp.com: On Tue, 2009-06-30 at 08:46 +0200, Michel Dänzer wrote: How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. I've read the reports, and I'm treating this as a bug at this point -- I need to see more information about how the ABI is broken so we can figure out how to fix it. You rejected backports before based on breaking ABI. Yup, let's figure out how to fix it. This ABI breakage is unintentional, I believe. I'm not sure you can easily. The DRI2BufferRec changes size (adds a new int format), the driver mallocs an array of these, so you are probably pwned in that case. I think the extension of DRI2InfoRec is probably okay, if the server checks the version. Dave. -- keith.pack...@intel.com ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Tue, Jun 30, 2009 at 19:09:00 +1000, Dave Airlie wrote: The DRI2BufferRec changes size (adds a new int format), the driver mallocs an array of these, so you are probably pwned in that case. I think the extension of DRI2InfoRec is probably okay, if the server checks the version. DRI2ScreenInit bails out if the driver was built with the old DRI2InfoRec version, so in that case the DRI2BufferRec mallocs shouldn't happen, unless I'm missing something. Cheers, Julien ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Michel Dänzer wrote: On Mon, 2009-06-29 at 16:03 -0700, Keith Packard wrote: Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, [...] How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. You rejected backports before based on breaking ABI. Don't get me wrong, I like the functionality those DRI2 changes fix, but surely they could have been done without breaking about every binary interface involved. If the video driver ABI won't be restored, this Actually, the bug in question could not. This was discussed quite a bit on the mailing list and on IRC. The original DRI2 interface was deficient and could not be made to work. So I fixed it. should be reflected by bumping its major version, and the changes breaking it should wait for the next major release like other such changes. The change is in the DRI2 interface, and that version was changed. Without the corresponding updates the only thing you lose is DRI2. Reverting to DRI1 should still work. Since this affects only the Intel driver, and we will have a fixed driver release around the same time as the X server release, I don't think this is a catastrophic problem. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpKb7wACgkQX1gOwKyEAw8PRACfbon5CuXyDPDMfA+OHLedj7uI I3MAn3qMXMadPzpqIoWFfeYjCJNniZAv =Mcf5 -END PGP SIGNATURE- ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Dave Airlie wrote: 2009/6/30 Keith Packard kei...@keithp.com: On Tue, 2009-06-30 at 08:46 +0200, Michel Dänzer wrote: How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. I've read the reports, and I'm treating this as a bug at this point -- I need to see more information about how the ABI is broken so we can figure out how to fix it. You rejected backports before based on breaking ABI. Yup, let's figure out how to fix it. This ABI breakage is unintentional, I believe. I'm not sure you can easily. The DRI2BufferRec changes size (adds a new int format), the driver mallocs an array of these, so you are probably pwned in that case. I think the extension of DRI2InfoRec is probably okay, if the server checks the version. The server checks the version and flat rejects drivers with the old version. Ditto for new drivers with an old server. Like I said to Michel, we discussed this quite a bit... you, Michel, and Kristian all participated in those discussions, so I'm a little confused why everyone is so surprised about this. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpKcFgACgkQX1gOwKyEAw+7zACfXWfqFC3J6dhee5M/uwA+IJ0a W9MAnAzchMvL9pJA0K8weXYzGN44ZkIS =nx8B -END PGP SIGNATURE- ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
How about: The DRI2 changes seem to break the video driver ABI, and apparently Mesa without corresponding changes (which will only be in the upcoming 7.5 release) as well. See Brice Goglin's report from a couple of days ago. I've read the reports, and I'm treating this as a bug at this point -- I need to see more information about how the ABI is broken so we can figure out how to fix it. You rejected backports before based on breaking ABI. Yup, let's figure out how to fix it. This ABI breakage is unintentional, I believe. I'm not sure you can easily. The DRI2BufferRec changes size (adds a new int format), the driver mallocs an array of these, so you are probably pwned in that case. I think the extension of DRI2InfoRec is probably okay, if the server checks the version. The server checks the version and flat rejects drivers with the old version. Ditto for new drivers with an old server. Like I said to Michel, we discussed this quite a bit... you, Michel, and Kristian all participated in those discussions, so I'm a little confused why everyone is so surprised about this. Essentially if a distro pushes out this X server, and has a KMS/DRI2 setup already working this will break it, unless they also push out a new X driver set (granted this is just Intel + maybe ATI) However you look at it this is still a broken ABI from the user POV I'm not saying its good or bad broken. Dave. ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Mon, 29 Jun 2009 16:03:20 -0700 Keith Packard kei...@keithp.com wrote: Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, I'll push this out as 1.6.2 shortly. Unless I missed something obvious, xf86-video-intel-2.7.99.901 won't build on this: i830_dri.c:66:18: error: dri2.h: No such file or directory i830_dri.c:83: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'I830DRI2CreateBuffers' i830_dri.c:242: error: expected declaration specifiers or '...' before 'DRI2BufferPtr' i830_dri.c: In function 'I830DRI2DestroyBuffers': i830_dri.c:250: error: 'buffers' undeclared (first use in this function) i830_dri.c:250: error: (Each undeclared identifier is reported only once i830_dri.c:250: error: for each function it appears in.) i830_dri.c: At top level: i830_dri.c:281: error: expected declaration specifiers or '...' before 'DRI2BufferPtr' i830_dri.c:281: error: expected declaration specifiers or '...' before 'DRI2BufferPtr' i830_dri.c: In function 'I830DRI2CopyRegion': i830_dri.c:283: error: 'pSrcBuffer' undeclared (first use in this function) i830_dri.c:284: error: 'pDstBuffer' undeclared (first use in this function) i830_dri.c:288: error: 'DRI2BufferFrontLeft' undeclared (first use in this function) i830_dri.c: In function 'I830DRI2ScreenInit': i830_dri.c:370: error: 'DRI2InfoRec' undeclared (first use in this function) i830_dri.c:370: error: expected ';' before 'info' i830_dri.c:397: error: 'info' undeclared (first use in this function) i830_dri.c:430: error: 'I830DRI2CreateBuffers' undeclared (first use in this function) i830_dri.c:436: warning: implicit declaration of function 'DRI2ScreenInit' i830_dri.c:436: warning: nested extern declaration of 'DRI2ScreenInit' i830_dri.c: In function 'I830DRI2CloseScreen': i830_dri.c:444: warning: implicit declaration of function 'DRI2CloseScreen' i830_dri.c:444: warning: nested extern declaration of 'DRI2CloseScreen' make[4]: *** [i830_dri.lo] Error 1 make[4]: *** Waiting for unfinished jobs make[3]: *** [all-recursive] Error 1 make[2]: *** [all] Error 2 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 signature.asc Description: PGP signature ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Mon, 2009-06-29 at 23:42 -0500, Robby Workman wrote: i830_dri.c:66:18: error: dri2.h: No such file or directory I'll bet you have an old version of dri2 proto, which caused the server to not build DRI2 support. -- keith.pack...@intel.com signature.asc Description: This is a digitally signed message part ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
On Mon, 29 Jun 2009 22:10:10 -0700 Keith Packard kei...@keithp.com wrote: On Mon, 2009-06-29 at 23:42 -0500, Robby Workman wrote: i830_dri.c:66:18: error: dri2.h: No such file or directory I'll bet you have an old version of dri2 proto, which caused the server to not build DRI2 support. Er, oops. I was at a conference when dri2proto-2.1 was released, so I guess I missed it. Sorry for the noise on that, but... I upgraded dri2proto, and now this happens (on mesa-7.4.4 fwiw) when building xorg-server-1.6.1.902: libtool: link: ( cd .libs rm -f libglx.la ln -s ../libglx.la libglx.la ) ../doltcompile gcc -DHAVE_CONFIG_H -I. -I../include -I../hw/xfree86/os-support -I../hw/xfree86/os-support/bus -I../hw/xfree86/common -I../hw/xfree86/dri -I../mi -I../hw/xfree86/dri2 -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/freetype2 -I/usr/include/pixman-1 -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include-I../include -I../include -I../Xext -I../composite -I../damageext -I../xfixes -I../Xi -I../mi -I../miext/shadow -I../miext/damage -I../render -I../randr -I../fb -I/tmp/package-mesa/usr/include -I/usr/include/drm -I/usr/include/X11/dri -DXFree86Server -D__GLX_ALIGN64 -O2 -fPIC -MT glxdri2.lo -MD -MP -MF .deps/glxdri2.Tpo -c -o glxdri2.lo glxdri2.c glxdri2.c: In function '__glXDRIbindTexImage': glxdri2.c:225: error: '__DRItexBufferExtension' has no member named 'setTexBuffer2' glxdri2.c:226: error: '__DRItexBufferExtension' has no member named 'setTexBuffer2' glxdri2.c: In function 'dri2FlushFrontBuffer': glxdri2.c:456: warning: implicit declaration of function '__glXDRIdrawableWaitGL' glxdri2.c:456: warning: nested extern declaration of '__glXDRIdrawableWaitGL' glxdri2.c: At top level: glxdri2.c:463: warning: excess elements in struct initializer glxdri2.c:463: warning: (near initialization for 'loaderExtension') make[1]: *** [glxdri2.lo] Error 1 make[1]: Leaving directory `/tmp/x11-build/xorg-server-1.6.1.902/glx' make: *** [all-recursive] Error 1 I *think* (based on ls -lRt of pub/individual) I've got the latest (released) bits of everything this touches... -RW signature.asc Description: PGP signature ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
Le 30/06/2009 01:03, Keith Packard a écrit : Kristian Høgsberg (1): Support setTexBuffer2 in AIGLX. Keith, That patch requires either some #ifdefs to make it build with mesa 7.4, or mesa's minimum version needs to be pushed to 7.5 in configure.ac. I have a preference for the former option, but the latter would fine too. Your call. Cheers, Rémi ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: [ANNOUNCE] xorg-server 1.6.1.902
Le 30/06/2009 01:03, Keith Packard a écrit : Thanks to Ajax for moving the DRI2 changes into the 1.6 branch, now I've pulled the remaining queued patches and have pushed this as 1.6.1.902 (1.6.2 RC2). If no-one finds any catastrophic bugs, I'll push this out as 1.6.2 shortly. This bug [1] is probably worth waiting for, as I've only been tracking the nominations page with our packages. So, one of the commits since Eamon's xace: Fix a bad device access hook call. seems to have broken KMS somehow. [1] http://bugs.freedesktop.org/show_bug.cgi?id=22537 Thanks for the new release Rémi ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
