OSDN Git Service
(root)
/
android-x86
/
external-minigbm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minigbm: pass in map flags to (*bo_map) callback
[android-x86/external-minigbm.git]
/
vc4.c
diff --git
a/vc4.c
b/vc4.c
index
c797bd9
..
20431d9
100644
(file)
--- a/
vc4.c
+++ b/
vc4.c
@@
-31,7
+31,7
@@
static int vc4_init(struct driver *drv)
}
static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
}
static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
- uint
32_t
flags)
+ uint
64_t use_
flags)
{
int ret;
size_t plane;
{
int ret;
size_t plane;
@@
-62,7
+62,7
@@
static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
return 0;
}
return 0;
}
-static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane,
int prot
)
+static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane,
uint32_t map_flags
)
{
int ret;
struct drm_vc4_mmap_bo bo_map;
{
int ret;
struct drm_vc4_mmap_bo bo_map;
@@
-77,7
+77,8
@@
static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane, int
}
data->length = bo->total_size;
}
data->length = bo->total_size;
- return mmap(0, bo->total_size, prot, MAP_SHARED, bo->drv->fd, bo_map.offset);
+ return mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
+ bo_map.offset);
}
struct backend backend_vc4 = {
}
struct backend backend_vc4 = {
@@
-87,6
+88,7
@@
struct backend backend_vc4 = {
.bo_import = drv_prime_bo_import,
.bo_destroy = drv_gem_bo_destroy,
.bo_map = vc4_bo_map,
.bo_import = drv_prime_bo_import,
.bo_destroy = drv_gem_bo_destroy,
.bo_map = vc4_bo_map,
+ .bo_unmap = drv_bo_munmap,
};
#endif
};
#endif