Return false instead of assertion failure

[android-x86/hardware-intel-common-vaapi.git] / src / intel_driver.c

diff --git a/src/intel_driver.c b/src/intel_driver.c
index 1638504..37e2fc6 100644 (file)
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -106,10 +106,11 @@ intel_driver_init(VADriverContextP ctx)
     if (g_intel_debug_option_flags)
         fprintf(stderr, "g_intel_debug_option_flags:%x\n", g_intel_debug_option_flags);
 
-    assert(drm_state);
-    assert(VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI1) ||
-           VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI2) ||
-           VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_CUSTOM));
+    ASSERT_RET(drm_state, false);
+    ASSERT_RET((VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI1) ||
+                VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI2) ||
+                VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_CUSTOM)),
+               false);
 
     intel->fd = drm_state->fd;
     intel->dri2Enabled = (VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI2) ||
@@ -122,7 +123,9 @@ intel_driver_init(VADriverContextP ctx)
     intel->locked = 0;
     pthread_mutex_init(&intel->ctxmutex, NULL);
 
-    intel_memman_init(intel);
+    if (!intel_memman_init(intel))
+        return false;
+
     intel->device_id = drm_intel_bufmgr_gem_get_devid(intel->bufmgr);
     intel->device_info = i965_get_device_info(intel->device_id);
 
@@ -157,7 +160,8 @@ intel_driver_init(VADriverContextP ctx)
 
 #define GEN9_PTE_CACHE    2
 
-    if (IS_GEN9(intel->device_info))
+    if (IS_GEN9(intel->device_info) ||
+        IS_GEN10(intel->device_info))
         intel->mocs_state = GEN9_PTE_CACHE;
 
     intel_driver_get_revid(intel, &intel->revision);