X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=helpers.h;h=dc1a7c06233353f5555c4f48c7cabe42e378a2fc;hb=4b5d0bf2ab4da0f475f01575fb369b7eb9415d7c;hp=5acd01fa55c5fc6a15bc8b711e59eb496c6bd6f0;hpb=6423ecbecac4ca1f376d2b36bc3b7f391ea7761e;p=android-x86%2Fexternal-minigbm.git

diff --git a/helpers.h b/helpers.h
index 5acd01f..dc1a7c0 100644
--- a/helpers.h
+++ b/helpers.h
@@ -10,29 +10,23 @@
 #include "drv.h"
 
 uint32_t drv_stride_from_format(uint32_t format, uint32_t width, 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, uint32_t flags);
+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,
+		       uint32_t flags);
 int drv_dumb_bo_destroy(struct bo *bo);
 int drv_gem_bo_destroy(struct bo *bo);
 int drv_prime_bo_import(struct bo *bo, struct drv_import_fd_data *data);
-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);
+void *drv_dumb_bo_map(struct bo *bo, struct map_info *data, size_t plane, int prot);
+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);
-int 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);
+int drv_add_combination(struct driver *drv, uint32_t format, struct format_metadata *metadata,
+			uint64_t usage);
+int 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 kms_item *drv_query_kms(struct driver *drv, uint32_t *num_items);
-int drv_add_linear_combinations(struct driver *drv, const uint32_t *formats,
-				uint32_t num_formats);
+int drv_modify_linear_combinations(struct driver *drv);
 #endif