#include "frontend/drm_driver.h"
#include "kms_dri_sw_winsys.h"
+#include "util/simple_mtx.h"
+
#ifdef DEBUG
#define DEBUG_PRINT(msg, ...) fprintf(stderr, msg, __VA_ARGS__)
#else
int map_count;
struct list_head link;
struct list_head planes;
+ mtx_t map_lock;
};
struct kms_sw_winsys
kms_sw_dt->format = format;
+ mtx_init(&kms_sw_dt->map_lock, mtx_plain);
+
memset(&create_req, 0, sizeof(create_req));
create_req.bpp = util_format_get_blocksizebits(format);
create_req.width = width;
list_del(&kms_sw_dt->link);
+ mtx_destroy(&kms_sw_dt->map_lock);
DEBUG_PRINT("KMS-DEBUG: destroyed buffer %u\n", kms_sw_dt->handle);
struct kms_sw_plane *tmp;
struct drm_mode_map_dumb map_req;
int prot, ret;
+ mtx_lock(&kms_sw_dt->map_lock);
memset(&map_req, 0, sizeof map_req);
map_req.handle = kms_sw_dt->handle;
ret = drmIoctl(kms_sw->fd, DRM_IOCTL_MODE_MAP_DUMB, &map_req);
if (ret)
- return NULL;
+ goto fail_locked;
prot = (flags == PIPE_MAP_READ) ? PROT_READ : (PROT_READ | PROT_WRITE);
void **ptr = (flags == PIPE_MAP_READ) ? &kms_sw_dt->ro_mapped : &kms_sw_dt->mapped;
void *tmp = mmap(NULL, kms_sw_dt->size, prot, MAP_SHARED,
kms_sw->fd, map_req.offset);
if (tmp == MAP_FAILED)
- return NULL;
+ goto fail_locked;
*ptr = tmp;
}
kms_sw_dt->map_count++;
+ mtx_unlock(&kms_sw_dt->map_lock);
+
return *ptr + plane->offset;
+fail_locked:
+ mtx_unlock(&kms_sw_dt->map_lock);
+ return NULL;
}
static struct kms_sw_displaytarget *
struct kms_sw_plane *plane = kms_sw_plane(dt);
struct kms_sw_displaytarget *kms_sw_dt = plane->dt;
+ mtx_lock(&kms_sw_dt->map_lock);
if (!kms_sw_dt->map_count) {
DEBUG_PRINT("KMS-DEBUG: ignore duplicated unmap %u", kms_sw_dt->handle);
+ mtx_unlock(&kms_sw_dt->map_lock);
return;
}
kms_sw_dt->map_count--;
if (kms_sw_dt->map_count) {
DEBUG_PRINT("KMS-DEBUG: ignore unmap for busy buffer %u", kms_sw_dt->handle);
+ mtx_unlock(&kms_sw_dt->map_lock);
return;
}
munmap(kms_sw_dt->ro_mapped, kms_sw_dt->size);
kms_sw_dt->ro_mapped = MAP_FAILED;
}
+ mtx_unlock(&kms_sw_dt->map_lock);
}
static struct sw_displaytarget *