* Jerome Glisse
*/
#define _FILE_OFFSET_BITS 64
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <errno.h>
#include "r600_priv.h"
-#include "xf86drm.h"
+#include "util/u_hash_table.h"
+#include "util/u_memory.h"
#include "radeon_drm.h"
+#include "xf86drm.h"
+#include <sys/mman.h>
+#include <errno.h>
int radeon_bo_fixed_map(struct radeon *radeon, struct radeon_bo *bo)
{
args.handle = bo->handle;
args.offset = 0;
args.size = (uint64_t)bo->size;
- r = drmCommandWriteRead(radeon->fd, DRM_RADEON_GEM_MMAP,
+ r = drmCommandWriteRead(radeon->info.fd, DRM_RADEON_GEM_MMAP,
&args, sizeof(args));
if (r) {
fprintf(stderr, "error mapping %p 0x%08X (error = %d)\n",
bo, bo->handle, r);
return r;
}
- ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, radeon->fd, args.addr_ptr);
+ ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, radeon->info.fd, args.addr_ptr);
if (ptr == MAP_FAILED) {
fprintf(stderr, "%s failed to map bo\n", __func__);
return -errno;
}
}
+#include "state_tracker/drm_driver.h"
+
struct radeon_bo *radeon_bo(struct radeon *radeon, unsigned handle,
- unsigned size, unsigned alignment, unsigned initial_domain)
+ unsigned size, unsigned alignment, unsigned bind,
+ unsigned initial_domain)
{
struct radeon_bo *bo;
- int r;
+ struct winsys_handle whandle = {};
+ whandle.handle = handle;
- if (handle) {
- pipe_mutex_lock(radeon->bo_handles_mutex);
- bo = util_hash_table_get(radeon->bo_handles,
- (void *)(uintptr_t)handle);
- if (bo) {
- struct radeon_bo *b = NULL;
- radeon_bo_reference(radeon, &b, bo);
- goto done;
- }
- }
bo = calloc(1, sizeof(*bo));
if (bo == NULL) {
return NULL;
}
- bo->size = size;
- bo->handle = handle;
pipe_reference_init(&bo->reference, 1);
- bo->alignment = alignment;
- LIST_INITHEAD(&bo->fencedlist);
if (handle) {
- struct drm_gem_open open_arg;
-
- memset(&open_arg, 0, sizeof(open_arg));
- open_arg.name = handle;
- r = drmIoctl(radeon->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
- if (r != 0) {
- free(bo);
- return NULL;
- }
- bo->name = handle;
- bo->handle = open_arg.handle;
- bo->size = open_arg.size;
- bo->shared = TRUE;
+ bo->buf = radeon->ws->buffer_from_handle(radeon->ws, &whandle, NULL, &size);
} else {
- struct drm_radeon_gem_create args = {};
-
- args.size = size;
- args.alignment = alignment;
- args.initial_domain = initial_domain;
- args.flags = 0;
- args.handle = 0;
- r = drmCommandWriteRead(radeon->fd, DRM_RADEON_GEM_CREATE,
- &args, sizeof(args));
- bo->handle = args.handle;
- if (r) {
- fprintf(stderr, "Failed to allocate :\n");
- fprintf(stderr, " size : %d bytes\n", size);
- fprintf(stderr, " alignment : %d bytes\n", alignment);
- free(bo);
- return NULL;
- }
+ bo->buf = radeon->ws->buffer_create(radeon->ws, size, alignment, bind, initial_domain);
}
-
- if (handle)
- util_hash_table_set(radeon->bo_handles, (void *)(uintptr_t)handle, bo);
-done:
- if (handle)
- pipe_mutex_unlock(radeon->bo_handles_mutex);
-
+ if (!bo->buf) {
+ FREE(bo);
+ return NULL;
+ }
+ bo->cs_buf = radeon->ws->buffer_get_cs_handle(bo->buf);
+ bo->handle = radeon->ws->trans_get_buffer_handle(bo->buf);
+ bo->size = size;
return bo;
}
static void radeon_bo_destroy(struct radeon *radeon, struct radeon_bo *bo)
{
- struct drm_gem_close args;
-
- if (bo->name) {
- pipe_mutex_lock(radeon->bo_handles_mutex);
- util_hash_table_remove(radeon->bo_handles,
- (void *)(uintptr_t)bo->name);
- pipe_mutex_unlock(radeon->bo_handles_mutex);
- }
- LIST_DEL(&bo->fencedlist);
radeon_bo_fixed_unmap(radeon, bo);
- memset(&args, 0, sizeof(args));
- args.handle = bo->handle;
- drmIoctl(radeon->fd, DRM_IOCTL_GEM_CLOSE, &args);
- memset(bo, 0, sizeof(struct radeon_bo));
- free(bo);
+ pb_reference(&bo->buf, NULL);
+ FREE(bo);
}
void radeon_bo_reference(struct radeon *radeon,
struct drm_radeon_gem_wait_idle args;
int ret;
- if (!bo->shared) {
- if (!bo->fence)
- return 0;
- if (bo->fence <= *radeon->cfence) {
- LIST_DELINIT(&bo->fencedlist);
- bo->fence = 0;
- return 0;
- }
- }
-
/* Zero out args to make valgrind happy */
memset(&args, 0, sizeof(args));
args.handle = bo->handle;
do {
- ret = drmCommandWriteRead(radeon->fd, DRM_RADEON_GEM_WAIT_IDLE,
+ ret = drmCommandWriteRead(radeon->info.fd, DRM_RADEON_GEM_WAIT_IDLE,
&args, sizeof(args));
} while (ret == -EBUSY);
return ret;
struct drm_radeon_gem_busy args;
int ret;
- if (!bo->shared) {
- if (!bo->fence)
- return 0;
- if (bo->fence <= *radeon->cfence) {
- LIST_DELINIT(&bo->fencedlist);
- bo->fence = 0;
- return 0;
- }
- }
-
memset(&args, 0, sizeof(args));
args.handle = bo->handle;
args.domain = 0;
- ret = drmCommandWriteRead(radeon->fd, DRM_RADEON_GEM_BUSY,
+ ret = drmCommandWriteRead(radeon->info.fd, DRM_RADEON_GEM_BUSY,
&args, sizeof(args));
*domain = args.domain;
int radeon_bo_get_tiling_flags(struct radeon *radeon,
struct radeon_bo *bo,
- uint32_t *tiling_flags,
- uint32_t *pitch)
+ uint32_t *tiling_flags)
{
struct drm_radeon_gem_get_tiling args = {};
int ret;
args.handle = bo->handle;
- ret = drmCommandWriteRead(radeon->fd, DRM_RADEON_GEM_GET_TILING,
+ ret = drmCommandWriteRead(radeon->info.fd, DRM_RADEON_GEM_GET_TILING,
&args, sizeof(args));
if (ret)
return ret;
*tiling_flags = args.tiling_flags;
- *pitch = args.pitch;
return ret;
}
int ret;
flink.handle = bo->handle;
- ret = drmIoctl(radeon->fd, DRM_IOCTL_GEM_FLINK, &flink);
+ ret = drmIoctl(radeon->info.fd, DRM_IOCTL_GEM_FLINK, &flink);
if (ret)
return ret;
projects / mesa.git / blobdiff