#include <limits.h>
#include <sys/types.h>
-#include <sys/mman.h>
#include <unistd.h>
#include <dlfcn.h>
#include <xf86drm.h>
surf->dri_private, buffer_mask, buffers);
}
+static void
+swrast_get_drawable_info(__DRIdrawable *driDrawable,
+ int *x,
+ int *y,
+ int *width,
+ int *height,
+ void *loaderPrivate)
+{
+ struct gbm_dri_surface *surf = loaderPrivate;
+
+ *x = 0;
+ *y = 0;
+ *width = surf->base.width;
+ *height = surf->base.height;
+}
+
+static void
+swrast_put_image2(__DRIdrawable *driDrawable,
+ int op,
+ int x,
+ int y,
+ int width,
+ int height,
+ int stride,
+ char *data,
+ void *loaderPrivate)
+{
+ struct gbm_dri_surface *surf = loaderPrivate;
+ struct gbm_dri_device *dri = gbm_dri_device(surf->base.gbm);
+
+ dri->swrast_put_image2(driDrawable,
+ op, x, y,
+ width, height, stride,
+ data, surf->dri_private);
+}
+
+static void
+swrast_put_image(__DRIdrawable *driDrawable,
+ int op,
+ int x,
+ int y,
+ int width,
+ int height,
+ char *data,
+ void *loaderPrivate)
+{
+ return swrast_put_image2(driDrawable, op, x, y, width, height,
+ width * 4, data, loaderPrivate);
+}
+
+static void
+swrast_get_image(__DRIdrawable *driDrawable,
+ int x,
+ int y,
+ int width,
+ int height,
+ char *data,
+ void *loaderPrivate)
+{
+ struct gbm_dri_surface *surf = loaderPrivate;
+ struct gbm_dri_device *dri = gbm_dri_device(surf->base.gbm);
+
+ dri->swrast_get_image(driDrawable,
+ x, y,
+ width, height,
+ data, surf->dri_private);
+}
+
static const __DRIuseInvalidateExtension use_invalidate = {
.base = { __DRI_USE_INVALIDATE, 1 }
};
.flushFrontBuffer = dri_flush_front_buffer,
};
+static const __DRIswrastLoaderExtension swrast_loader_extension = {
+ .base = { __DRI_SWRAST_LOADER, 2 },
+
+ .getDrawableInfo = swrast_get_drawable_info,
+ .putImage = swrast_put_image,
+ .getImage = swrast_get_image,
+ .putImage2 = swrast_put_image2
+};
+
static const __DRIextension *gbm_dri_screen_extensions[] = {
&image_lookup_extension.base,
&use_invalidate.base,
&dri2_loader_extension.base,
&image_loader_extension.base,
+ &swrast_loader_extension.base,
NULL,
};
{ NULL, 0, 0 }
};
+static struct dri_extension_match gbm_swrast_device_extensions[] = {
+ { __DRI_CORE, 1, offsetof(struct gbm_dri_device, core), },
+ { __DRI_SWRAST, 1, offsetof(struct gbm_dri_device, swrast) },
+ { NULL, 0, 0 }
+};
+
static int
dri_bind_extensions(struct gbm_dri_device *dri,
struct dri_extension_match *matches,
return ret;
}
-static int
-dri_load_driver(struct gbm_dri_device *dri)
+static const __DRIextension **
+dri_open_driver(struct gbm_dri_device *dri)
{
const __DRIextension **extensions = NULL;
char path[PATH_MAX], *search_paths, *p, *next, *end;
char *get_extensions_name;
search_paths = NULL;
+ /* don't allow setuid apps to use LIBGL_DRIVERS_PATH or GBM_DRIVERS_PATH */
if (geteuid() == getuid()) {
- /* don't allow setuid apps to use GBM_DRIVERS_PATH */
+ /* Read GBM_DRIVERS_PATH first for compatibility, but LIBGL_DRIVERS_PATH
+ * is recommended over GBM_DRIVERS_PATH.
+ */
search_paths = getenv("GBM_DRIVERS_PATH");
+
+ /* Read LIBGL_DRIVERS_PATH if GBM_DRIVERS_PATH was not set.
+ * LIBGL_DRIVERS_PATH is recommended over GBM_DRIVERS_PATH.
+ */
+ if (search_paths == NULL) {
+ search_paths = getenv("LIBGL_DRIVERS_PATH");
+ }
}
if (search_paths == NULL)
search_paths = DEFAULT_DRIVER_DIR;
}
if (dri->driver == NULL) {
- fprintf(stderr, "gbm: failed to open any driver (search paths %s)",
+ fprintf(stderr, "gbm: failed to open any driver (search paths %s)\n",
search_paths);
- return -1;
+ fprintf(stderr, "gbm: Last dlopen error: %s\n", dlerror());
+ return NULL;
}
if (asprintf(&get_extensions_name, "%s_%s",
if (extensions == NULL) {
fprintf(stderr, "gbm: driver exports no extensions (%s)", dlerror());
dlclose(dri->driver);
+ }
+
+ return extensions;
+}
+
+static int
+dri_load_driver(struct gbm_dri_device *dri)
+{
+ const __DRIextension **extensions;
+
+ extensions = dri_open_driver(dri);
+ if (!extensions)
+ return -1;
+
+ if (dri_bind_extensions(dri, gbm_dri_device_extensions, extensions) < 0) {
+ dlclose(dri->driver);
+ fprintf(stderr, "failed to bind extensions\n");
return -1;
}
+
dri->driver_extensions = extensions;
- if (dri_bind_extensions(dri, gbm_dri_device_extensions, extensions) < 0) {
+ return 0;
+}
+
+static int
+dri_load_driver_swrast(struct gbm_dri_device *dri)
+{
+ const __DRIextension **extensions;
+
+ extensions = dri_open_driver(dri);
+ if (!extensions)
+ return -1;
+
+ if (dri_bind_extensions(dri, gbm_swrast_device_extensions, extensions) < 0) {
dlclose(dri->driver);
fprintf(stderr, "failed to bind extensions\n");
return -1;
}
+ dri->driver_extensions = extensions;
+
return 0;
}
static int
-dri_screen_create(struct gbm_dri_device *dri)
+dri_screen_create_dri2(struct gbm_dri_device *dri, char *driver_name)
{
const __DRIextension **extensions;
int ret = 0;
- dri->base.driver_name = loader_get_driver_for_fd(dri->base.base.fd, 0);
+ dri->base.driver_name = driver_name;
if (dri->base.driver_name == NULL)
return -1;
return ret;
}
+static int
+dri_screen_create_swrast(struct gbm_dri_device *dri)
+{
+ int ret;
+
+ dri->base.driver_name = strdup("swrast");
+ if (dri->base.driver_name == NULL)
+ return -1;
+
+ ret = dri_load_driver_swrast(dri);
+ if (ret) {
+ fprintf(stderr, "failed to load swrast driver\n");
+ return ret;
+ }
+
+ dri->extensions = gbm_dri_screen_extensions;
+
+ if (dri->swrast == NULL)
+ return -1;
+
+ if (dri->swrast->base.version >= 4) {
+ dri->screen = dri->swrast->createNewScreen2(0, dri->extensions,
+ dri->driver_extensions,
+ &dri->driver_configs, dri);
+ } else {
+ dri->screen = dri->swrast->createNewScreen(0, dri->extensions,
+ &dri->driver_configs, dri);
+ }
+ if (dri->screen == NULL)
+ return -1;
+
+ dri->lookup_image = NULL;
+ dri->lookup_user_data = NULL;
+
+ return 0;
+}
+
+static int
+dri_screen_create(struct gbm_dri_device *dri)
+{
+ char *driver_name;
+
+ driver_name = loader_get_driver_for_fd(dri->base.base.fd, 0);
+ if (!driver_name)
+ return -1;
+
+ return dri_screen_create_dri2(dri, driver_name);
+}
+
+static int
+dri_screen_create_sw(struct gbm_dri_device *dri)
+{
+ char *driver_name;
+ int ret;
+
+ driver_name = strdup("kms_swrast");
+ if (!driver_name)
+ return -errno;
+
+ ret = dri_screen_create_dri2(dri, driver_name);
+ if (ret == 0)
+ return ret;
+
+ return dri_screen_create_swrast(dri);
+}
+
static int
gbm_dri_is_format_supported(struct gbm_device *gbm,
uint32_t format,
if (bo->image != NULL) {
dri->image->destroyImage(bo->image);
} else {
- munmap(bo->map, bo->size);
+ gbm_dri_bo_unmap(bo);
memset(&arg, 0, sizeof(arg));
arg.handle = bo->handle;
drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
int gbm_format;
/* Required for query image WIDTH & HEIGHT */
- if (dri->image->base.version < 4) {
+ if (dri->image == NULL || dri->image->base.version < 4) {
errno = ENOSYS;
return NULL;
}
{
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;
struct drm_mode_destroy_dumb destroy_arg;
int ret;
+ int is_cursor, is_scanout;
- if (!(usage & GBM_BO_USE_CURSOR)) {
- errno = EINVAL;
- return NULL;
- }
- if (format != GBM_FORMAT_ARGB8888) {
+ is_cursor = (usage & GBM_BO_USE_CURSOR) != 0 &&
+ format == GBM_FORMAT_ARGB8888;
+ is_scanout = (usage & GBM_BO_USE_SCANOUT) != 0 &&
+ format == GBM_FORMAT_XRGB8888;
+ if (!is_cursor && !is_scanout) {
errno = EINVAL;
return NULL;
}
if (bo == NULL)
return NULL;
+ memset(&create_arg, 0, sizeof(create_arg));
create_arg.bpp = 32;
create_arg.width = width;
create_arg.height = height;
bo->handle = create_arg.handle;
bo->size = create_arg.size;
- memset(&map_arg, 0, sizeof(map_arg));
- map_arg.handle = bo->handle;
-
- ret = drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_MAP_DUMB, &map_arg);
- if (ret)
- goto destroy_dumb;
-
- bo->map = mmap(0, bo->size, PROT_WRITE,
- MAP_SHARED, dri->base.base.fd, map_arg.offset);
- if (bo->map == MAP_FAILED)
+ if (gbm_dri_bo_map(bo) == NULL)
goto destroy_dumb;
return &bo->base.base;
int dri_format;
unsigned dri_use = 0;
- if (usage & GBM_BO_USE_WRITE)
+ if (usage & GBM_BO_USE_WRITE || dri->image == NULL)
return create_dumb(gbm, width, height, format, usage);
bo = calloc(1, sizeof *bo);
dri_use |= __DRI_IMAGE_USE_SCANOUT;
if (usage & GBM_BO_USE_CURSOR)
dri_use |= __DRI_IMAGE_USE_CURSOR;
+ if (usage & GBM_BO_USE_LINEAR)
+ dri_use |= __DRI_IMAGE_USE_LINEAR;
/* Gallium drivers requires shared in order to get the handle/stride */
dri_use |= __DRI_IMAGE_USE_SHARE;
dri_destroy(struct gbm_device *gbm)
{
struct gbm_dri_device *dri = gbm_dri_device(gbm);
+ unsigned i;
dri->core->destroyScreen(dri->screen);
+ for (i = 0; dri->driver_configs[i]; i++)
+ free((__DRIconfig *) dri->driver_configs[i]);
free(dri->driver_configs);
dlclose(dri->driver);
free(dri->base.driver_name);
dri_device_create(int fd)
{
struct gbm_dri_device *dri;
- int ret;
+ int ret, force_sw;
dri = calloc(1, sizeof *dri);
if (!dri)
dri->base.type = GBM_DRM_DRIVER_TYPE_DRI;
dri->base.base.name = "drm";
- ret = dri_screen_create(dri);
+ force_sw = getenv("GBM_ALWAYS_SOFTWARE") != NULL;
+ if (!force_sw) {
+ ret = dri_screen_create(dri);
+ if (ret)
+ ret = dri_screen_create_sw(dri);
+ } else {
+ ret = dri_screen_create_sw(dri);
+ }
+
if (ret)
goto err_dri;
projects / mesa.git / blobdiff