diff options
| author | dawes <dawes> | 2001-05-01 21:39:08 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-05-01 21:39:08 +0000 |
| commit | eaffbc49b7ffad575e12c348b31c083eee0dfd2b (patch) | |
| tree | 6f71460dddcd7ab96f89a1045b4d4e4fcd2ea7b3 /xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c | |
| parent | c983988d91d546ee463ea56c1d0a8126c2c2bc7a (diff) | |
Initial merge for XFree86 4.0.99.3 import
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c index eaf1d1969..c5e624f52 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.6 2001/03/21 17:02:25 dawes Exp $ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.8 2001/04/18 14:52:42 dawes Exp $ * Acceleration for the Creator and Creator3D framebuffer - DRI/DRM support. * * Copyright (C) 2000 David S. Miller (davem@redhat.com) @@ -214,20 +214,20 @@ FFBDRIScreenInit(ScreenPtr pScreen) "FFBDRIScreenInit failed (libdri.a too old)\n"); return FALSE; } - + /* Check the DRI version */ { - int major, minor, patch; - DRIQueryVersion(&major, &minor, &patch); - if (major != 3 || minor != 1 || patch < 0) { - xf86DrvMsg(pScreen->myNum, X_ERROR, - "[dri] FFBDRIScreenInit failed because of a version mismatch.\n" - "[dri] libDRI version is %d.%d.%d but version 3.1.x is needed.\n" - "[dri] Disabling DRI.\n", - major, minor, patch); - return FALSE; - } - } + int major, minor, patch; + DRIQueryVersion(&major, &minor, &patch); + if (major != 4 || minor < 0) { + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[dri] FFBDRIScreenInit failed because of a version mismatch.\n" + "[dri] libDRI version is %d.%d.%d but version, 4.0.x is needed.\n" + "[dri] Disabling DRI.\n", + major, minor, patch); + return FALSE; + } + } pDRIInfo = DRICreateInfoRec(); if (pDRIInfo == NULL) |