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
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
[android-x86/external-minigbm.git]
/
vc4.c
diff --git
a/vc4.c
b/vc4.c
index
9103b8a
..
71e73ea
100644
(file)
--- a/
vc4.c
+++ b/
vc4.c
@@
-16,16
+16,19
@@
#include "helpers.h"
#include "util.h"
#include "helpers.h"
#include "util.h"
-static const uint32_t
supported
_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
- DRM_FORMAT_XRGB8888 };
+static const uint32_t
render_target
_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
+
DRM_FORMAT_XRGB8888 };
static int vc4_init(struct driver *drv)
{
static int vc4_init(struct driver *drv)
{
- return drv_add_linear_combinations(drv, supported_formats, ARRAY_SIZE(supported_formats));
+ drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+ &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+ return drv_modify_linear_combinations(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;
@@
-45,9
+48,7
@@
static int vc4_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_
ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
if (ret) {
ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create);
if (ret) {
- fprintf(stderr, "drv: DRM_IOCTL_VC4_GEM_CREATE failed "
- "(size=%zu)\n",
- bo->total_size);
+ drv_log("DRM_IOCTL_VC4_GEM_CREATE failed (size=%zu)\n", bo->total_size);
return ret;
}
return ret;
}
@@
-57,7
+58,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
)
+static void *vc4_bo_map(struct bo *bo, struct
vma *vma, 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;
@@
-67,23
+68,23
@@
static void *vc4_bo_map(struct bo *bo, struct map_info *data, size_t plane)
ret = drmCommandWriteRead(bo->drv->fd, DRM_VC4_MMAP_BO, &bo_map, sizeof(bo_map));
if (ret) {
ret = drmCommandWriteRead(bo->drv->fd, DRM_VC4_MMAP_BO, &bo_map, sizeof(bo_map));
if (ret) {
-
fprintf(stderr, "drv:
DRM_VC4_MMAP_BO failed\n");
+
drv_log("
DRM_VC4_MMAP_BO failed\n");
return MAP_FAILED;
}
return MAP_FAILED;
}
- data->length = bo->total_size;
-
- return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->drv->fd,
+ vma->length = bo->total_size;
+ return mmap(NULL, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd,
bo_map.offset);
}
bo_map.offset);
}
-struct backend backend_vc4 = {
+
const
struct backend backend_vc4 = {
.name = "vc4",
.init = vc4_init,
.bo_create = vc4_bo_create,
.bo_import = drv_prime_bo_import,
.bo_destroy = drv_gem_bo_destroy,
.bo_map = vc4_bo_map,
.name = "vc4",
.init = vc4_init,
.bo_create = vc4_bo_create,
.bo_import = drv_prime_bo_import,
.bo_destroy = drv_gem_bo_destroy,
.bo_map = vc4_bo_map,
+ .bo_unmap = drv_bo_munmap,
};
#endif
};
#endif