#include <assert.h>
#include <errno.h>
#include <fcntl.h>
-#include <pthread.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include "drv_priv.h"
#include "helpers.h"
#include "util.h"
+#include "i915_private.h"
#ifdef DRV_AMDGPU
extern struct backend backend_amdgpu;
if (!drv->backend)
goto free_driver;
- if (pthread_mutex_init(&drv->driver_lock, NULL))
- goto free_driver;
-
drv->buffer_table = drmHashCreate();
if (!drv->buffer_table)
- goto free_lock;
+ goto free_driver;
drv->map_table = drmHashCreate();
if (!drv->map_table)
}
}
+ ATOMIC_VAR_INIT(drv->driver_lock);
+
return drv;
free_map_table:
drmHashDestroy(drv->map_table);
free_buffer_table:
drmHashDestroy(drv->buffer_table);
-free_lock:
- pthread_mutex_destroy(&drv->driver_lock);
free_driver:
free(drv);
return NULL;
void drv_destroy(struct driver *drv)
{
- pthread_mutex_lock(&drv->driver_lock);
+ ATOMIC_LOCK(&drv->driver_lock);
if (drv->backend->close)
drv->backend->close(drv);
free(drv->combos.data);
- pthread_mutex_unlock(&drv->driver_lock);
- pthread_mutex_destroy(&drv->driver_lock);
+ ATOMIC_UNLOCK(&drv->driver_lock);
free(drv);
}
return NULL;
}
- pthread_mutex_lock(&drv->driver_lock);
+ ATOMIC_LOCK(&drv->driver_lock);
+
+ for (plane = 0; plane < bo->num_planes; plane++) {
+ if (plane > 0)
+ assert(bo->offsets[plane] >= bo->offsets[plane - 1]);
- for (plane = 0; plane < bo->num_planes; plane++)
drv_increment_reference_count(drv, bo, plane);
+ }
- pthread_mutex_unlock(&drv->driver_lock);
+ ATOMIC_UNLOCK(&drv->driver_lock);
return bo;
}
return NULL;
}
- pthread_mutex_lock(&drv->driver_lock);
+ ATOMIC_LOCK(&drv->driver_lock);
+
+ for (plane = 0; plane < bo->num_planes; plane++) {
+ if (plane > 0)
+ assert(bo->offsets[plane] >= bo->offsets[plane - 1]);
- for (plane = 0; plane < bo->num_planes; plane++)
drv_increment_reference_count(drv, bo, plane);
+ }
- pthread_mutex_unlock(&drv->driver_lock);
+ ATOMIC_UNLOCK(&drv->driver_lock);
return bo;
}
uintptr_t total = 0;
struct driver *drv = bo->drv;
- pthread_mutex_lock(&drv->driver_lock);
+ ATOMIC_LOCK(&drv->driver_lock);
for (plane = 0; plane < bo->num_planes; plane++)
drv_decrement_reference_count(drv, bo, plane);
for (plane = 0; plane < bo->num_planes; plane++)
total += drv_get_reference_count(drv, bo, plane);
- pthread_mutex_unlock(&drv->driver_lock);
+ ATOMIC_UNLOCK(&drv->driver_lock);
if (total == 0) {
assert(drv_map_info_destroy(bo) == 0);
int ret;
size_t plane;
struct bo *bo;
+ off_t seek_end;
bo = drv_bo_new(drv, data->width, data->height, data->format, data->use_flags);
bo->strides[plane] = data->strides[plane];
bo->offsets[plane] = data->offsets[plane];
bo->format_modifiers[plane] = data->format_modifiers[plane];
- if (plane == bo->num_planes - 1 || data->offsets[plane + 1] == 0) {
- bo->sizes[plane] =
- lseek(data->fds[plane], 0, SEEK_END) - data->offsets[plane];
- lseek(data->fds[plane], 0, SEEK_SET);
- } else {
+
+ seek_end = lseek(data->fds[plane], 0, SEEK_END);
+ if (seek_end == (off_t)(-1)) {
+ fprintf(stderr, "drv: lseek() failed with %s\n", strerror(errno));
+ goto destroy_bo;
+ }
+
+ lseek(data->fds[plane], 0, SEEK_SET);
+ if (plane == bo->num_planes - 1 || data->offsets[plane + 1] == 0)
+ bo->sizes[plane] = seek_end - data->offsets[plane];
+ else
bo->sizes[plane] = data->offsets[plane + 1] - data->offsets[plane];
+
+ if ((int64_t)bo->offsets[plane] + bo->sizes[plane] > seek_end) {
+ fprintf(stderr, "drv: buffer size is too large.\n");
+ goto destroy_bo;
}
bo->total_size += bo->sizes[plane];
}
return bo;
+
+destroy_bo:
+ drv_bo_destroy(bo);
+ return NULL;
}
void *drv_bo_map(struct bo *bo, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
assert(x + width <= drv_bo_get_width(bo));
assert(y + height <= drv_bo_get_height(bo));
assert(BO_MAP_READ_WRITE & map_flags);
+ /* No CPU access for protected buffers. */
+ assert(!(bo->use_flags & BO_USE_PROTECTED));
- pthread_mutex_lock(&bo->drv->driver_lock);
+ ATOMIC_LOCK(&bo->drv->driver_lock);
if (!drmHashLookup(bo->drv->map_table, bo->handles[plane].u32, &ptr)) {
data = (struct map_info *)ptr;
+ /* TODO(gsingh): support mapping same buffer with different flags. */
+ assert(data->map_flags == map_flags);
data->refcount++;
goto success;
}
if (addr == MAP_FAILED) {
*map_data = NULL;
free(data);
- pthread_mutex_unlock(&bo->drv->driver_lock);
+ ATOMIC_UNLOCK(&bo->drv->driver_lock);
return MAP_FAILED;
}
data->refcount = 1;
data->addr = addr;
data->handle = bo->handles[plane].u32;
+ data->map_flags = map_flags;
drmHashInsert(bo->drv->map_table, bo->handles[plane].u32, (void *)data);
success:
+ drv_bo_invalidate(bo, data);
*map_data = data;
offset = drv_bo_get_plane_stride(bo, plane) * y;
offset += drv_stride_from_format(bo->format, x, plane);
addr = (uint8_t *)data->addr;
addr += drv_bo_get_plane_offset(bo, plane) + offset;
- pthread_mutex_unlock(&bo->drv->driver_lock);
+ ATOMIC_UNLOCK(&bo->drv->driver_lock);
return (void *)addr;
}
if (ret)
return ret;
- pthread_mutex_lock(&bo->drv->driver_lock);
+ ATOMIC_LOCK(&bo->drv->driver_lock);
if (!--data->refcount) {
ret = bo->drv->backend->bo_unmap(bo, data);
free(data);
}
- pthread_mutex_unlock(&bo->drv->driver_lock);
+ ATOMIC_UNLOCK(&bo->drv->driver_lock);;
+
+ return ret;
+}
+
+int drv_bo_invalidate(struct bo *bo, struct map_info *data)
+{
+ int ret = 0;
+ assert(data);
+ assert(data->refcount >= 0);
+
+ if (bo->drv->backend->bo_invalidate)
+ ret = bo->drv->backend->bo_invalidate(bo, data);
return ret;
}
int ret = 0;
assert(data);
assert(data->refcount >= 0);
+ assert(!(bo->use_flags & BO_USE_PROTECTED));
if (bo->drv->backend->bo_flush)
ret = bo->drv->backend->bo_flush(bo, data);
return 3;
}
- fprintf(stderr, "drv: UNKNOWN FORMAT %d\n", format);
- return 0;
+ return i915_private_num_planes_from_format(format);
}
uint32_t drv_num_buffers_per_bo(struct bo *bo)
OSDN Git Service
