Mesa (master): st/xorg: Don't advertise DRI2 version we don' t actually support yet.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: b0ba8d6f807543d461272833a76059fed8a4d6e9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0ba8d6f807543d461272833a76059fed8a4d6e9

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Tue May 18 17:14:47 2010 +0200

st/xorg: Don't advertise DRI2 version we don't actually support yet.

Fixes DRI2 initialization with current xserver Git.

---

 src/gallium/state_trackers/xorg/xorg_dri2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index b90f9c9..921b690 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -403,7 +403,7 @@ xorg_dri2_init(ScreenPtr pScreen)
     }
 #endif
 
-    dri2info.version = DRI2INFOREC_VERSION;
+    dri2info.version = min(DRI2INFOREC_VERSION, 3);
     dri2info.fd = ms->fd;
 
     dri2info.driverName = pScrn->driverName;