Commit: 19cf264f30919b872dd8d4517ab9cdbf1057860d - hardware-intel-intel-driver (git)

hardware/intel/intel-driver

Commit MetaInfo

• Revision: 19cf264f30919b872dd8d4517ab9cdbf1057860d (tree)
• Zeit: 2015-09-06 16:13:57
• Autor: Xu Guangxin <Guangxin.Xu@inte...>
• Commiter: Xiang, Haihao

Log Message

CreateSurfaces2: forward function return to caller

we did not check following function's return:
i965_surface_native_memory
i965_suface_external_memory
i965_check_alloc_surface_bo
It will be in trouble if underlay buffer allocation is failed.
(cherry picked from commit 12b3d9ef379e6159e30c2aafc040f1137cd4141a)

Ändern Zusammenfassung

• modified: src/i965_drv_video.c

Diff

--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -989,9 +989,7 @@ i965_surface_native_memory(VADriverContextP ctx,
         expected_fourcc == VA_FOURCC_YV16)
         tiling = 0;
 
-    i965_check_alloc_surface_bo(ctx, obj_surface, tiling, expected_fourcc, get_sampling_from_fourcc(expected_fourcc));
-
-    return VA_STATUS_SUCCESS;
+    return i965_check_alloc_surface_bo(ctx, obj_surface, tiling, expected_fourcc, get_sampling_from_fourcc(expected_fourcc));
 }
     
 static VAStatus
@@ -1327,19 +1325,23 @@ i965_CreateSurfaces2(
                     }
                 }
             }
-            i965_surface_native_memory(ctx,
-                                       obj_surface,
-                                       format,
-                                       expected_fourcc);
+            vaStatus = i965_surface_native_memory(ctx,
+                                                  obj_surface,
+                                                  format,
+                                                  expected_fourcc);
             break;
 
         case I965_SURFACE_MEM_GEM_FLINK:
         case I965_SURFACE_MEM_DRM_PRIME:
-            i965_suface_external_memory(ctx,
-                                        obj_surface,
-                                        memory_type,
-                                        memory_attibute,
-                                        i);
+            vaStatus = i965_suface_external_memory(ctx,
+                                                   obj_surface,
+                                                   memory_type,
+                                                   memory_attibute,
+                                                   i);
+            break;
+        }
+        if (VA_STATUS_SUCCESS != vaStatus) {
+            i965_destroy_surface(&i965->surface_heap, (struct object_base *)obj_surface);
             break;
         }
     }