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 061d9ef..37e2fc6 100644 (file)
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -27,61 +27,94 @@
  *
  */
 
-#include <assert.h>
+#include "sysdeps.h"
 
 #include <va/va_drmcommon.h>
 
 #include "intel_batchbuffer.h"
 #include "intel_memman.h"
 #include "intel_driver.h"
+uint32_t g_intel_debug_option_flags = 0;
+
+#ifdef I915_PARAM_HAS_BSD2
+#define LOCAL_I915_PARAM_HAS_BSD2 I915_PARAM_HAS_BSD2
+#endif
+
+#ifndef LOCAL_I915_PARAM_HAS_BSD2
+#define LOCAL_I915_PARAM_HAS_BSD2   30
+#endif
+
+#ifdef I915_PARAM_HAS_HUC
+#define LOCAL_I915_PARAM_HAS_HUC I915_PARAM_HAS_HUC
+#else
+#define LOCAL_I915_PARAM_HAS_HUC 42
+#endif
+
+#ifdef I915_PARAM_EU_TOTAL
+#define LOCAL_I915_PARAM_EU_TOTAL I915_PARAM_EU_TOTAL
+#else
+#define LOCAL_I915_PARAM_EU_TOTAL 34
+#endif
 
 static Bool
 intel_driver_get_param(struct intel_driver_data *intel, int param, int *value)
 {
-   struct drm_i915_getparam gp;
+    struct drm_i915_getparam gp;
 
-   gp.param = param;
-   gp.value = value;
+    gp.param = param;
+    gp.value = value;
 
-   return drmCommandWriteRead(intel->fd, DRM_I915_GETPARAM, &gp, sizeof(gp)) == 0;
+    return drmCommandWriteRead(intel->fd, DRM_I915_GETPARAM, &gp, sizeof(gp)) == 0;
 }
 
 static void intel_driver_get_revid(struct intel_driver_data *intel, int *value)
 {
-#define PCI_REVID      8
-       FILE *fp;
-       char config_data[16];
-       
-       fp = fopen("/sys/devices/pci0000:00/0000:00:02.0/config", "r");
-
-        if (fp) {
-            if (fread(config_data, 1, 16, fp))
-                *value = config_data[PCI_REVID];
-            else
-                *value = 2; /* assume it is at least  B-steping */
-            fclose(fp);
-        } else {
+#define PCI_REVID   8
+    FILE *fp;
+    char config_data[16];
+
+    fp = fopen("/sys/devices/pci0000:00/0000:00:02.0/config", "r");
+
+    if (fp) {
+        if (fread(config_data, 1, 16, fp))
+            *value = config_data[PCI_REVID];
+        else
             *value = 2; /* assume it is at least  B-steping */
-        }
+        fclose(fp);
+    } else {
+        *value = 2; /* assume it is at least  B-steping */
+    }
 
-       return;
+    return;
 }
 
-bool 
+extern const struct intel_device_info *i965_get_device_info(int devid);
+
+bool
 intel_driver_init(VADriverContextP ctx)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
     struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state;
-    int has_exec2, has_bsd, has_blt;
+    int has_exec2 = 0, has_bsd = 0, has_blt = 0, has_vebox = 0;
+    char *env_str = NULL;
+    int ret_value = 0;
+
+    g_intel_debug_option_flags = 0;
+    if ((env_str = getenv("VA_INTEL_DEBUG")))
+        g_intel_debug_option_flags = atoi(env_str);
 
-    assert(drm_state);
-    assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 ||
-           drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
-           drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+    if (g_intel_debug_option_flags)
+        fprintf(stderr, "g_intel_debug_option_flags:%x\n", g_intel_debug_option_flags);
+
+    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 = (drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
-                          drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
+    intel->dri2Enabled = (VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_DRI2) ||
+                          VA_CHECK_DRM_AUTH_TYPE(ctx, VA_DRM_AUTH_CUSTOM));
 
     if (!intel->dri2Enabled) {
         return false;
@@ -90,20 +123,52 @@ intel_driver_init(VADriverContextP ctx)
     intel->locked = 0;
     pthread_mutex_init(&intel->ctxmutex, NULL);
 
-    intel_driver_get_param(intel, I915_PARAM_CHIPSET_ID, &intel->device_id);
+    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);
+
+    if (!intel->device_info)
+        return false;
+
     if (intel_driver_get_param(intel, I915_PARAM_HAS_EXECBUF2, &has_exec2))
         intel->has_exec2 = has_exec2;
     if (intel_driver_get_param(intel, I915_PARAM_HAS_BSD, &has_bsd))
         intel->has_bsd = has_bsd;
     if (intel_driver_get_param(intel, I915_PARAM_HAS_BLT, &has_blt))
         intel->has_blt = has_blt;
-   
+    if (intel_driver_get_param(intel, I915_PARAM_HAS_VEBOX, &has_vebox))
+        intel->has_vebox = !!has_vebox;
+
+    intel->has_bsd2 = 0;
+    if (intel_driver_get_param(intel, LOCAL_I915_PARAM_HAS_BSD2, &ret_value))
+        intel->has_bsd2 = !!ret_value;
+
+    intel->has_huc = 0;
+    ret_value = 0;
+
+    if (intel_driver_get_param(intel, LOCAL_I915_PARAM_HAS_HUC, &ret_value))
+        intel->has_huc = !!ret_value;
+
+    intel->eu_total = 0;
+    if (intel_driver_get_param(intel, LOCAL_I915_PARAM_EU_TOTAL, &ret_value)) {
+        intel->eu_total = ret_value;
+    }
+
+    intel->mocs_state = 0;
+
+#define GEN9_PTE_CACHE    2
+
+    if (IS_GEN9(intel->device_info) ||
+        IS_GEN10(intel->device_info))
+        intel->mocs_state = GEN9_PTE_CACHE;
+
     intel_driver_get_revid(intel, &intel->revision);
-    intel_memman_init(intel);
     return true;
 }
 
-void 
+void
 intel_driver_terminate(VADriverContextP ctx)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);