Move LIBVA_DRIVER_NAME check in vaInitialize().

va/va.c

@@ -331,6 +331,7 @@ VAStatus vaInitialize (
     int *minor_version 	 /* out */
 )
 {
+    const char *driver_name_env = NULL;
     char *driver_name = NULL;
     VAStatus vaStatus;
 
@@ -340,8 +341,19 @@ VAStatus vaInitialize (
 
     va_infoMessage("libva version %s\n", VA_VERSION_S);
 
+    driver_name_env = getenv("LIBVA_DRIVER_NAME");
+    if (driver_name_env && geteuid() == getuid())
+    {
+        /* Don't allow setuid apps to use LIBVA_DRIVER_NAME */
+        driver_name = strdup(driver_name_env);
+        vaStatus = VA_STATUS_SUCCESS;
+        va_infoMessage("User requested driver '%s'\n", driver_name);
+    }
+    else
+    {
         vaStatus = va_getDriverName(dpy, &driver_name);
         va_infoMessage("va_getDriverName() returns %d\n", vaStatus);
+    }
 
     if (VA_STATUS_SUCCESS == vaStatus)
     {

va/x11/va_x11.c

@@ -136,19 +136,10 @@ static VAStatus va_DisplayContextGetDriverName (
 )
 {
     VAStatus vaStatus;
-    char *driver_name_env;
 
     if (driver_name)
 	*driver_name = NULL;
 
-    if ((driver_name_env = getenv("LIBVA_DRIVER_NAME")) != NULL
-        && geteuid() == getuid())
-    {
-        /* don't allow setuid apps to use LIBVA_DRIVER_NAME */
-        *driver_name = strdup(driver_name_env);
-        return VA_STATUS_SUCCESS;
-    }
-
     vaStatus = va_DRI2GetDriverName(pDisplayContext, driver_name);
     if (vaStatus != VA_STATUS_SUCCESS)
         vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name);