From bbe197ec1d29647884ec4b2dd5812ff7b0cc8b05 Mon Sep 17 00:00:00 2001
From: Thomas Hellström <thomas@tungstengraphics.com>
Date: Tue, 11 Jul 2006 14:56:20 +0000
Subject: Revert the SiS and Unichrome DRM version check changes.
---
src/mesa/drivers/dri/sis/sis_screen.c | 24 +-----------------------
src/mesa/drivers/dri/unichrome/via_screen.c | 23 +----------------------
2 files changed, 2 insertions(+), 45 deletions(-)
(limited to 'src')
diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c
index a721a724ac..4fd692ec24 100644
--- a/src/mesa/drivers/dri/sis/sis_screen.c
+++ b/src/mesa/drivers/dri/sis/sis_screen.c
@@ -350,37 +350,15 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn,
static const __DRIversion ddx_expected = {0, 8, 0};
static const __DRIversion dri_expected = {4, 0, 0};
static const __DRIversion drm_expected = {1, 0, 0};
- static const __DRIversion drm_compat = {2, 0, 0};
static const char *driver_name = "SiS";
dri_interface = interface;
- /*
- * Check ddx and dri only.
- */
-
if (!driCheckDriDdxDrmVersions2(driver_name, dri_version, &dri_expected,
ddx_version, &ddx_expected,
- drm_version, drm_version)) {
+ drm_version, &drm_expected)) {
return NULL;
}
- /*
- * Check drm version with major versioning span.
- */
-
- if (((drm_version->major < drm_expected.major) ||
- (drm_version->major > drm_compat.major)) ||
- ((drm_version->major == drm_expected.major) &&
- (drm_version->minor < drm_expected.minor))) {
-
- fprintf(stderr, "%s DRI driver expected DRM version %d.%d.x - %d.x.x "
- "but got version %d.%d.%d\n", driver_name,
- drm_expected.major, drm_expected.minor, drm_compat.major,
- drm_version->major, drm_version->minor, drm_version->patch);
- return NULL;
- }
-
-
psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
ddx_version, dri_version, drm_version,
frame_buffer, pSAREA, fd,
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index 18cbbb3517..4f137c8ceb 100644
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -435,38 +435,17 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn,
VIA_DRIDDX_VERSION_PATCH };
static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 2, 3, 0 };
- static const __DRIversion drm_compat = {3, 0, 0};
static const char *driver_name = "Unichrome";
dri_interface = interface;
- /*
- * Check ddx and dri only.
- */
-
if ( ! driCheckDriDdxDrmVersions2( driver_name,
dri_version, & dri_expected,
ddx_version, & ddx_expected,
- drm_version, drm_version) ) {
+ drm_version, & drm_expected) ) {
return NULL;
}
- /*
- * Check drm version with major versioning span.
- */
-
- if (((drm_version->major < drm_expected.major) ||
- (drm_version->major > drm_compat.major)) ||
- ((drm_version->major == drm_expected.major) &&
- (drm_version->minor < drm_expected.minor))) {
-
- fprintf(stderr, "%s DRI driver expected DRM version %d.%d.x - %d.x.x "
- "but got version %d.%d.%d\n", driver_name,
- drm_expected.major, drm_expected.minor, drm_compat.major,
- drm_version->major, drm_version->minor, drm_version->patch);
- return NULL;
- }
-
psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
ddx_version, dri_version, drm_version,
frame_buffer, pSAREA, fd,
--
cgit v1.2.3