#include <limits.h>
#include <sys/types.h>
+#include <sys/mman.h>
#include <unistd.h>
#include <dlfcn.h>
+#include <xf86drm.h>
#include <GL/gl.h> /* dri_interface needs GL types */
#include <GL/internal/dri_interface.h>
#include "gbm_driint.h"
#include "gbmint.h"
+#include "loader.h"
/* For importing wl_buffer */
#if HAVE_WAYLAND_PLATFORM
count, out_count, surf->dri_private);
}
+static int
+image_get_buffers(__DRIdrawable *driDrawable,
+ unsigned int format,
+ uint32_t *stamp,
+ void *loaderPrivate,
+ uint32_t buffer_mask,
+ struct __DRIimageList *buffers)
+{
+ struct gbm_dri_surface *surf = loaderPrivate;
+ struct gbm_dri_device *dri = gbm_dri_device(surf->base.gbm);
+
+ if (dri->image_get_buffers == NULL)
+ return 0;
+
+ return dri->image_get_buffers(driDrawable, format, stamp,
+ surf->dri_private, buffer_mask, buffers);
+}
+
static const __DRIuseInvalidateExtension use_invalidate = {
{ __DRI_USE_INVALIDATE, 1 }
};
dri_lookup_egl_image
};
-const __DRIdri2LoaderExtension dri2_loader_extension = {
- { __DRI_DRI2_LOADER, 3 },
- dri_get_buffers,
- dri_flush_front_buffer,
- dri_get_buffers_with_format,
+static const __DRIdri2LoaderExtension dri2_loader_extension = {
+ .base = { __DRI_DRI2_LOADER, 3 },
+
+ .getBuffers = dri_get_buffers,
+ .flushFrontBuffer = dri_flush_front_buffer,
+ .getBuffersWithFormat = dri_get_buffers_with_format,
+};
+
+static const __DRIimageLoaderExtension image_loader_extension = {
+ .base = { __DRI_IMAGE_LOADER, 1 },
+
+ .getBuffers = image_get_buffers,
+ .flushFrontBuffer = dri_flush_front_buffer,
};
+
struct dri_extension_match {
const char *name;
int version;
static int
dri_load_driver(struct gbm_dri_device *dri)
{
- const __DRIextension **extensions;
+ const __DRIextension **extensions = NULL;
char path[PATH_MAX], *search_paths, *p, *next, *end;
+ char *get_extensions_name;
search_paths = NULL;
if (geteuid() == getuid()) {
snprintf(path, sizeof path,
"%.*s/%s_dri.so", len, p, dri->base.driver_name);
dri->driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
- if (dri->driver == NULL)
- fprintf(stderr, "failed to open %s: %s\n", path, dlerror());
}
+ /* not need continue to loop all paths once the driver is found */
+ if (dri->driver != NULL)
+ break;
}
if (dri->driver == NULL) {
return -1;
}
- extensions = dlsym(dri->driver, __DRI_DRIVER_EXTENSIONS);
+ if (asprintf(&get_extensions_name, "%s_%s",
+ __DRI_DRIVER_GET_EXTENSIONS, dri->base.driver_name) != -1) {
+ const __DRIextension **(*get_extensions)(void);
+
+ get_extensions = dlsym(dri->driver, get_extensions_name);
+ free(get_extensions_name);
+
+ if (get_extensions)
+ extensions = get_extensions();
+ }
+
+ if (!extensions)
+ extensions = dlsym(dri->driver, __DRI_DRIVER_EXTENSIONS);
if (extensions == NULL) {
fprintf(stderr, "gbm: driver exports no extensions (%s)", dlerror());
dlclose(dri->driver);
return -1;
}
-
+ dri->driver_extensions = extensions;
if (dri_bind_extensions(dri, gbm_dri_device_extensions, extensions) < 0) {
dlclose(dri->driver);
const __DRIextension **extensions;
int ret = 0;
- dri->base.driver_name = dri_fd_get_driver_name(dri->base.base.fd);
+ dri->base.driver_name = loader_get_driver_for_fd(dri->base.base.fd, 0);
if (dri->base.driver_name == NULL)
return -1;
dri->extensions[0] = &image_lookup_extension.base;
dri->extensions[1] = &use_invalidate.base;
dri->extensions[2] = &dri2_loader_extension.base;
- dri->extensions[3] = NULL;
+ dri->extensions[3] = &image_loader_extension.base;
+ dri->extensions[4] = NULL;
if (dri->dri2 == NULL)
return -1;
- dri->screen = dri->dri2->createNewScreen(0, dri->base.base.fd,
- dri->extensions,
- &dri->driver_configs, dri);
+ if (dri->dri2->base.version >= 4) {
+ dri->screen = dri->dri2->createNewScreen2(0, dri->base.base.fd,
+ dri->extensions,
+ dri->driver_extensions,
+ &dri->driver_configs, dri);
+ } else {
+ dri->screen = dri->dri2->createNewScreen(0, dri->base.base.fd,
+ dri->extensions,
+ &dri->driver_configs, dri);
+ }
if (dri->screen == NULL)
return -1;
gbm_dri_bo_write(struct gbm_bo *_bo, const void *buf, size_t count)
{
struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
- void *ptr;
- int ret;
- if (bo->bo == NULL)
+ if (bo->image != NULL)
return -1;
- ret = kms_bo_map(bo->bo, &ptr);
- if (ret < 0)
+ memcpy(bo->map, buf, count);
+
+ return 0;
+}
+
+static int
+gbm_dri_bo_get_fd(struct gbm_bo *_bo)
+{
+ struct gbm_dri_device *dri = gbm_dri_device(_bo->gbm);
+ struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
+ int fd;
+
+ if (bo->image == NULL)
return -1;
- memcpy(ptr, buf, count);
+ dri->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_FD, &fd);
- kms_bo_unmap(bo->bo);
- return 0;
+ return fd;
}
static void
{
struct gbm_dri_device *dri = gbm_dri_device(_bo->gbm);
struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
+ struct drm_mode_destroy_dumb arg;
- if (bo->image != NULL)
+ if (bo->image != NULL) {
dri->image->destroyImage(bo->image);
- if (bo->bo != NULL)
- kms_bo_destroy(&bo->bo);
+ } else {
+ munmap(bo->map, bo->size);
+ memset(&arg, 0, sizeof(arg));
+ arg.handle = bo->handle;
+ drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
+ }
+
free(bo);
}
#if HAVE_WAYLAND_PLATFORM
case GBM_BO_IMPORT_WL_BUFFER:
{
- struct wl_drm_buffer *wb = (struct wl_drm_buffer *) buffer;
+ struct wl_drm_buffer *wb;
+
+ if (!dri->wl_drm)
+ return NULL;
+
+ wb = wayland_drm_buffer_get(dri->wl_drm, (struct wl_resource *) buffer);
+ if (!wb)
+ return NULL;
image = wb->driver_buffer;
case WL_DRM_FORMAT_ARGB8888:
gbm_format = GBM_FORMAT_ARGB8888;
break;
+ case WL_DRM_FORMAT_RGB565:
+ gbm_format = GBM_FORMAT_RGB565;
+ break;
case WL_DRM_FORMAT_YUYV:
gbm_format = GBM_FORMAT_YUYV;
break;
}
static struct gbm_bo *
-gbm_dri_bo_create(struct gbm_device *gbm,
+create_dumb(struct gbm_device *gbm,
uint32_t width, uint32_t height,
uint32_t format, uint32_t usage)
{
struct gbm_dri_device *dri = gbm_dri_device(gbm);
+ struct drm_mode_create_dumb create_arg;
+ struct drm_mode_map_dumb map_arg;
struct gbm_dri_bo *bo;
- int dri_format;
- unsigned dri_use = 0;
+ struct drm_mode_destroy_dumb destroy_arg;
+ int ret;
+
+ if (!(usage & GBM_BO_USE_CURSOR_64X64))
+ return NULL;
+ if (format != GBM_FORMAT_ARGB8888)
+ return NULL;
bo = calloc(1, sizeof *bo);
if (bo == NULL)
return NULL;
+ create_arg.bpp = 32;
+ create_arg.width = width;
+ create_arg.height = height;
+
+ ret = drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_arg);
+ if (ret)
+ goto free_bo;
+
bo->base.base.gbm = gbm;
bo->base.base.width = width;
bo->base.base.height = height;
+ bo->base.base.stride = create_arg.pitch;
+ bo->base.base.format = format;
+ bo->base.base.handle.u32 = create_arg.handle;
+ bo->handle = create_arg.handle;
+ bo->size = create_arg.size;
- if (usage & GBM_BO_USE_WRITE) {
- int ret;
- unsigned attrs[7] = {
- KMS_WIDTH, 64,
- KMS_HEIGHT, 64,
- KMS_BO_TYPE, KMS_BO_TYPE_SCANOUT_X8R8G8B8,
- KMS_TERMINATE_PROP_LIST,
- };
+ memset(&map_arg, 0, sizeof(map_arg));
+ map_arg.handle = bo->handle;
- if (!(usage & GBM_BO_USE_CURSOR_64X64))
- return NULL;
+ ret = drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_MAP_DUMB, &map_arg);
+ if (ret)
+ goto destroy_dumb;
- if (dri->kms == NULL)
- return NULL;
+ bo->map = mmap(0, bo->size, PROT_WRITE,
+ MAP_SHARED, dri->base.base.fd, map_arg.offset);
+ if (bo->map == MAP_FAILED)
+ goto destroy_dumb;
- ret = kms_bo_create(dri->kms, attrs, &bo->bo);
- if (ret < 0) {
- free(bo);
- return NULL;
- }
+ return &bo->base.base;
- kms_bo_get_prop(bo->bo, KMS_PITCH, &bo->base.base.stride);
- kms_bo_get_prop(bo->bo, KMS_HANDLE, (unsigned*)&bo->base.base.handle);
+destroy_dumb:
+ memset(&destroy_arg, 0, sizeof destroy_arg);
+ destroy_arg.handle = create_arg.handle;
+ drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_arg);
+free_bo:
+ free(bo);
- return &bo->base.base;
- }
+ return NULL;
+}
+
+static struct gbm_bo *
+gbm_dri_bo_create(struct gbm_device *gbm,
+ uint32_t width, uint32_t height,
+ uint32_t format, uint32_t usage)
+{
+ struct gbm_dri_device *dri = gbm_dri_device(gbm);
+ struct gbm_dri_bo *bo;
+ int dri_format;
+ unsigned dri_use = 0;
+
+ if (usage & GBM_BO_USE_WRITE)
+ return create_dumb(gbm, width, height, format, usage);
+
+ bo = calloc(1, sizeof *bo);
+ if (bo == NULL)
+ return NULL;
+
+ bo->base.base.gbm = gbm;
+ bo->base.base.width = width;
+ bo->base.base.height = height;
+ bo->base.base.format = format;
switch (format) {
case GBM_FORMAT_RGB565:
case GBM_FORMAT_ABGR8888:
dri_format = __DRI_IMAGE_FORMAT_ABGR8888;
break;
+ case GBM_FORMAT_ARGB2101010:
+ dri_format = __DRI_IMAGE_FORMAT_ARGB2101010;
+ break;
+ case GBM_FORMAT_XRGB2101010:
+ dri_format = __DRI_IMAGE_FORMAT_XRGB2101010;
+ break;
default:
- return NULL;
+ goto failed;
}
if (usage & GBM_BO_USE_SCANOUT)
dri_format, dri_use,
bo);
if (bo->image == NULL)
- return NULL;
+ goto failed;
dri->image->queryImage(bo->image, __DRI_IMAGE_ATTRIB_HANDLE,
&bo->base.base.handle.s32);
(int *) &bo->base.base.stride);
return &bo->base.base;
+
+failed:
+ free(bo);
+ return NULL;
}
static struct gbm_surface *
dri->base.base.bo_import = gbm_dri_bo_import;
dri->base.base.is_format_supported = gbm_dri_is_format_supported;
dri->base.base.bo_write = gbm_dri_bo_write;
+ dri->base.base.bo_get_fd = gbm_dri_bo_get_fd;
dri->base.base.bo_destroy = gbm_dri_bo_destroy;
dri->base.base.destroy = dri_destroy;
dri->base.base.surface_create = gbm_dri_surface_create;
dri->base.type = GBM_DRM_DRIVER_TYPE_DRI;
dri->base.base.name = "drm";
- kms_create(fd, &dri->kms);
- if (dri->kms == NULL)
- goto err_kms;
-
ret = dri_screen_create(dri);
if (ret)
goto err_dri;
return &dri->base.base;
err_dri:
- kms_destroy(&dri->kms);
-err_kms:
free(dri);
+
return NULL;
}
projects / mesa.git / blobdiff