fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 05:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert the SiS and Unichrome DRM version check changes.

Browse source
This commit is contained in:
Thomas Hellström 2006-07-11 14:56:20 +00:00
parent 85b4ae0654
commit bbe197ec1d
2 changed files with 2 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/mesa/drivers/dri/sis/sis_screen.c
View file

@ -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,

23
src/mesa/drivers/dri/unichrome/via_screen.c
View file

@ -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,