Module: Mesa Branch: mesa_7_7_branch Commit: ae97520e37ee70c813a198c805c7338aefbd8156 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae97520e37ee70c813a198c805c7338aefbd8156
Author: Thomas Hellstrom <[email protected]> Date: Mon Jan 18 15:55:17 2010 +0100 ws/vmware: Check DRM version also when bootstrapping in dri2 mode. Signed-off-by: Thomas Hellstrom <[email protected]> --- .../winsys/drm/vmware/core/vmw_screen_dri.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c b/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c index 5995eee..7c47d43 100644 --- a/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c +++ b/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c @@ -85,6 +85,23 @@ vmw_drm_create_screen(struct drm_api *drm_api, struct pipe_screen *screen; struct dri1_create_screen_arg *dri1; + if (!arg || arg->mode == DRM_CREATE_NORMAL) { + struct dri1_api_version drm_ver; + drmVersionPtr ver; + + ver = drmGetVersion(fd); + if (ver == NULL) + return NULL; + + drm_ver.major = ver->version_major; + drm_ver.minor = ver->version_minor; + + drmFreeVersion(ver); + if (!vmw_dri1_check_version(&drm_ver, &drm_required, + &drm_compat, "vmwgfx drm driver")) + return NULL; + } + if (arg != NULL) { switch (arg->mode) { case DRM_CREATE_NORMAL: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
