#include "drv.h"
-struct bo {
- struct driver *drv;
+struct bo_metadata {
uint32_t width;
uint32_t height;
uint32_t format;
uint32_t tiling;
size_t num_planes;
- union bo_handle handles[DRV_MAX_PLANES];
uint32_t offsets[DRV_MAX_PLANES];
uint32_t sizes[DRV_MAX_PLANES];
uint32_t strides[DRV_MAX_PLANES];
uint64_t format_modifiers[DRV_MAX_PLANES];
uint64_t use_flags;
size_t total_size;
+};
+
+struct bo {
+ struct driver *drv;
+ struct bo_metadata meta;
+ union bo_handle handles[DRV_MAX_PLANES];
void *priv;
};
uint64_t use_flags;
};
-struct combinations {
- struct combination *data;
- uint32_t size;
- uint32_t allocations;
-};
-
struct driver {
int fd;
const struct backend *backend;
void *priv;
void *buffer_table;
- void *map_table;
- struct combinations combos;
+ struct drv_array *mappings;
+ struct drv_array *combos;
pthread_mutex_t driver_lock;
};
uint32_t format, const uint64_t *modifiers, uint32_t count);
int (*bo_destroy)(struct bo *bo);
int (*bo_import)(struct bo *bo, struct drv_import_fd_data *data);
- void *(*bo_map)(struct bo *bo, struct mapping *mapping, size_t plane, uint32_t map_flags);
- int (*bo_unmap)(struct bo *bo, struct mapping *mapping);
+ void *(*bo_map)(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags);
+ int (*bo_unmap)(struct bo *bo, struct vma *vma);
int (*bo_invalidate)(struct bo *bo, struct mapping *mapping);
int (*bo_flush)(struct bo *bo, struct mapping *mapping);
- uint32_t (*resolve_format)(uint32_t format, uint64_t use_flags);
+ uint32_t (*resolve_format)(struct driver *drv, uint32_t format, uint64_t use_flags);
};
// clang-format off
BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY | BO_USE_TEXTURE
-#define LINEAR_METADATA (struct format_metadata) { 0, 1, DRM_FORMAT_MOD_NONE }
+#define BO_USE_SW_MASK BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN | \
+ BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY
+
+#ifndef DRM_FORMAT_MOD_LINEAR
+#define DRM_FORMAT_MOD_LINEAR DRM_FORMAT_MOD_NONE
+#endif
+
+#define LINEAR_METADATA (struct format_metadata) { 1, 0, DRM_FORMAT_MOD_LINEAR }
// clang-format on
#endif