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
Revert "Revert "minigbm: replace DRM_FORMAT_MOD_INVALID with DRM_FORMAT_MOD_LINEAR""
[android-x86/external-minigbm.git]
/
nouveau.c
diff --git
a/nouveau.c
b/nouveau.c
index
89122da
..
d0f25d4
100644
(file)
--- a/
nouveau.c
+++ b/
nouveau.c
@@
-8,22
+8,22
@@
#include "helpers.h"
#include "util.h"
#include "helpers.h"
#include "util.h"
-static struct supported_combination combos[2] = {
- {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_RENDERING},
- {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE, BO_USE_CURSOR | BO_USE_RENDERING},
-};
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
static int nouveau_init(struct driver *drv)
{
static int nouveau_init(struct driver *drv)
{
- drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
- return drv_add_kms_flags(drv);
+ drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
+ &LINEAR_METADATA, BO_USE_RENDER_MASK);
+
+ return drv_modify_linear_combinations(drv);
}
}
-struct backend backend_nouveau =
-{
+const struct backend backend_nouveau = {
.name = "nouveau",
.init = nouveau_init,
.bo_create = drv_dumb_bo_create,
.bo_destroy = drv_dumb_bo_destroy,
.name = "nouveau",
.init = nouveau_init,
.bo_create = drv_dumb_bo_create,
.bo_destroy = drv_dumb_bo_destroy,
+ .bo_import = drv_prime_bo_import,
.bo_map = drv_dumb_bo_map,
.bo_map = drv_dumb_bo_map,
+ .bo_unmap = drv_bo_munmap,
};
};