X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=helpers.h;h=4c649c2ceb1466e0f938304b15b13ca4791cb16d;hb=222919005b758a0afe24d2c2cc4bac342b575bbd;hp=383d28b539c017c455f4eade513d321d2448c696;hpb=2a119342ee6f057b1ec28d1ff6ebd70d42511a3f;p=android-x86%2Fexternal-minigbm.git

diff --git a/helpers.h b/helpers.h
index 383d28b..4c649c2 100644
--- a/helpers.h
+++ b/helpers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+ * Copyright 2014 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -8,20 +8,32 @@
 #define HELPERS_H
 
 #include "drv.h"
+#include "helpers_array.h"
 
-int drv_bpp_from_format(uint32_t format, size_t plane);
-int drv_bo_from_format(struct bo *bo, uint32_t width, uint32_t height,
-		       drv_format_t format);
-int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height,
-		       uint32_t format, uint32_t flags);
+uint32_t drv_height_from_format(uint32_t format, uint32_t height, size_t plane);
+uint32_t drv_size_from_format(uint32_t format, uint32_t stride, uint32_t height, size_t plane);
+int drv_bo_from_format(struct bo *bo, uint32_t stride, uint32_t aligned_height, uint32_t format);
+int drv_dumb_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
+		       uint64_t use_flags);
 int drv_dumb_bo_destroy(struct bo *bo);
 int drv_gem_bo_destroy(struct bo *bo);
-void *drv_dumb_bo_map(struct bo *bo, struct map_info *data, size_t plane);
-uintptr_t drv_get_reference_count(struct driver *drv, struct bo *bo,
-				  size_t plane);
-void drv_increment_reference_count(struct driver *drv, struct bo *bo,
-				   size_t plane);
-void drv_decrement_reference_count(struct driver *drv, struct bo *bo,
-				   size_t plane);
+int drv_prime_bo_import(struct bo *bo, struct drv_import_fd_data *data);
+void *drv_dumb_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags);
+int drv_bo_munmap(struct bo *bo, struct vma *vma);
+int drv_mapping_destroy(struct bo *bo);
+int drv_get_prot(uint32_t map_flags);
+uintptr_t drv_get_reference_count(struct driver *drv, struct bo *bo, size_t plane);
+void drv_increment_reference_count(struct driver *drv, struct bo *bo, size_t plane);
+void drv_decrement_reference_count(struct driver *drv, struct bo *bo, size_t plane);
 uint32_t drv_log_base2(uint32_t value);
+int drv_add_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+			uint64_t usage);
+void drv_add_combinations(struct driver *drv, const uint32_t *formats, uint32_t num_formats,
+			  struct format_metadata *metadata, uint64_t usage);
+void drv_modify_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+			    uint64_t usage);
+struct drv_array *drv_query_kms(struct driver *drv);
+int drv_modify_linear_combinations(struct driver *drv);
+uint64_t drv_pick_modifier(const uint64_t *modifiers, uint32_t count,
+			   const uint64_t *modifier_order, uint32_t order_count);
 #endif