From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Mon, 18 Jan 2010 14:55:17 +0000 (+0100)
Subject: ws/vmware: Check DRM version also when bootstrapping in dri2 mode.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae97520e37ee70c813a198c805c7338aefbd8156;p=mesa.git

ws/vmware: Check DRM version also when bootstrapping in dri2 mode.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
---

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 5995eee34ba..7c47d434f0e 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: