summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/unichrome
diff options
context:
space:
mode:
authorThomas Hellström <[email protected]>2006-07-11 14:56:20 +0000
committerThomas Hellström <[email protected]>2006-07-11 14:56:20 +0000
commitbbe197ec1d29647884ec4b2dd5812ff7b0cc8b05 (patch)
treee2aa0b30a363d42aec06aa9566f7426bccbb04ea /src/mesa/drivers/dri/unichrome
parent85b4ae065435c8b4c4696b75e95f897130ee8bdf (diff)
Revert the SiS and Unichrome DRM version check changes.
Diffstat (limited to 'src/mesa/drivers/dri/unichrome')
-rw-r--r--src/mesa/drivers/dri/unichrome/via_screen.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index 18cbbb35177..4f137c8ceb8 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,