X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=dri.c;h=97dc567e6ba43939a08bd8bed97cbd9c1d6607ba;hb=4adb4bc9a3a3364dcdbabd78d0d9c5f7e6aaa0d9;hp=8ca00c6bc70415e7a737f12b09a66fb3fa82ea02;hpb=a0e602b84f99141700a5ab1e282ac22d4ea776a0;p=android-x86%2Fexternal-minigbm.git diff --git a/dri.c b/dri.c index 8ca00c6..97dc567 100644 --- a/dri.c +++ b/dri.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -64,26 +65,130 @@ static bool lookup_extension(const __DRIextension *const *extensions, const char } /* + * Close Gem Handle + */ +static void close_gem_handle(uint32_t handle, int fd) +{ + struct drm_gem_close gem_close; + int ret = 0; + + memset(&gem_close, 0, sizeof(gem_close)); + gem_close.handle = handle; + ret = drmIoctl(fd, DRM_IOCTL_GEM_CLOSE, &gem_close); + if (ret) + drv_log("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", handle, ret); +} + +/* * The DRI GEM namespace may be different from the minigbm's driver GEM namespace. We have * to import into minigbm. */ static int import_into_minigbm(struct dri_driver *dri, struct bo *bo) { uint32_t handle; - int prime_fd, ret; + int ret, modifier_upper, modifier_lower, num_planes, i, j; + off_t dmabuf_sizes[DRV_MAX_PLANES]; + __DRIimage *plane_image = NULL; + + if (dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_MODIFIER_UPPER, + &modifier_upper) && + dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_MODIFIER_LOWER, + &modifier_lower)) { + bo->meta.format_modifiers[0] = + ((uint64_t)modifier_upper << 32) | (uint32_t)modifier_lower; + } else { + bo->meta.format_modifiers[0] = DRM_FORMAT_MOD_INVALID; + } - if (!dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_FD, &prime_fd)) + if (!dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_NUM_PLANES, + &num_planes)) { return -errno; + } - ret = drmPrimeFDToHandle(bo->drv->fd, prime_fd, &handle); - if (ret) { - drv_log("drmPrimeFDToHandle failed with %s\n", strerror(errno)); - return ret; + bo->meta.num_planes = num_planes; + + for (i = 0; i < num_planes; ++i) { + int prime_fd, stride, offset; + plane_image = dri->image_extension->fromPlanar(bo->priv, i, NULL); + __DRIimage *image = plane_image ? plane_image : bo->priv; + + if (i) + bo->meta.format_modifiers[i] = bo->meta.format_modifiers[0]; + + if (!dri->image_extension->queryImage(image, __DRI_IMAGE_ATTRIB_STRIDE, &stride) || + !dri->image_extension->queryImage(image, __DRI_IMAGE_ATTRIB_OFFSET, &offset)) { + ret = -errno; + goto cleanup; + } + + if (!dri->image_extension->queryImage(image, __DRI_IMAGE_ATTRIB_FD, &prime_fd)) { + ret = -errno; + goto cleanup; + } + + dmabuf_sizes[i] = lseek(prime_fd, 0, SEEK_END); + if (dmabuf_sizes[i] == (off_t)-1) { + ret = -errno; + close(prime_fd); + goto cleanup; + } + + lseek(prime_fd, 0, SEEK_SET); + + ret = drmPrimeFDToHandle(bo->drv->fd, prime_fd, &handle); + + close(prime_fd); + + if (ret) { + drv_log("drmPrimeFDToHandle failed with %s\n", strerror(errno)); + goto cleanup; + } + + bo->handles[i].u32 = handle; + + bo->meta.strides[i] = stride; + bo->meta.offsets[i] = offset; + + if (plane_image) + dri->image_extension->destroyImage(plane_image); + } + + for (i = 0; i < num_planes; ++i) { + off_t next_plane = dmabuf_sizes[i]; + for (j = 0; j < num_planes; ++j) { + if (bo->meta.offsets[j] < next_plane && + bo->meta.offsets[j] > bo->meta.offsets[i] && + bo->handles[j].u32 == bo->handles[i].u32) + next_plane = bo->meta.offsets[j]; + } + + bo->meta.sizes[i] = next_plane - bo->meta.offsets[i]; + + /* This is kind of misleading if different planes use + different dmabufs. */ + bo->meta.total_size += bo->meta.sizes[i]; } - bo->handles[0].u32 = handle; - close(prime_fd); return 0; + +cleanup: + if (plane_image) + dri->image_extension->destroyImage(plane_image); + while (--i >= 0) { + for (j = 0; j <= i; ++j) + if (bo->handles[j].u32 == bo->handles[i].u32) + break; + + /* Multiple equivalent handles) */ + if (i == j) + break; + + /* This kind of goes horribly wrong when we already imported + * the same handles earlier, as we should really reference + * count handles. */ + close_gem_handle(bo->handles[i].u32, bo->drv->fd); + } + return ret; } /* @@ -96,9 +201,14 @@ int dri_init(struct driver *drv, const char *dri_so_path, const char *driver_suf const __DRIextension *loader_extensions[] = { NULL }; struct dri_driver *dri = drv->priv; + + dri->fd = open(drmGetRenderDeviceNameFromFd(drv_get_fd(drv)), O_RDWR); + if (dri->fd < 0) + return -ENODEV; + dri->driver_handle = dlopen(dri_so_path, RTLD_NOW | RTLD_GLOBAL); if (!dri->driver_handle) - return -ENODEV; + goto close_dri_fd; snprintf(fname, sizeof(fname), __DRI_DRIVER_GET_EXTENSIONS "_%s", driver_suffix); get_extensions = dlsym(dri->driver_handle, fname); @@ -118,7 +228,7 @@ int dri_init(struct driver *drv, const char *dri_so_path, const char *driver_suf (const __DRIextension **)&dri->dri2_extension)) goto free_handle; - dri->device = dri->dri2_extension->createNewScreen2(0, drv_get_fd(drv), loader_extensions, + dri->device = dri->dri2_extension->createNewScreen2(0, dri->fd, loader_extensions, dri->extensions, &dri->configs, NULL); if (!dri->device) goto free_handle; @@ -146,6 +256,8 @@ free_screen: free_handle: dlclose(dri->driver_handle); dri->driver_handle = NULL; +close_dri_fd: + close(dri->fd); return -ENODEV; } @@ -160,16 +272,16 @@ void dri_close(struct driver *drv) dri->core_extension->destroyScreen(dri->device); dlclose(dri->driver_handle); dri->driver_handle = NULL; + close(dri->fd); } int dri_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, uint64_t use_flags) { unsigned int dri_use; - int ret, dri_format, stride, offset; + int ret, dri_format; struct dri_driver *dri = bo->drv->priv; - assert(bo->num_planes == 1); dri_format = drm_format_to_dri_format(format); /* Gallium drivers require shared to get the handle and stride. */ @@ -192,20 +304,36 @@ int dri_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t forma if (ret) goto free_image; - if (!dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_STRIDE, &stride)) { - ret = -errno; - goto free_image; + return 0; + +free_image: + dri->image_extension->destroyImage(bo->priv); + return ret; +} + +int dri_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, + const uint64_t *modifiers, uint32_t modifier_count) +{ + int ret, dri_format; + struct dri_driver *dri = bo->drv->priv; + + if (!dri->image_extension->createImageWithModifiers) { + return -ENOENT; } - if (!dri->image_extension->queryImage(bo->priv, __DRI_IMAGE_ATTRIB_OFFSET, &offset)) { + dri_format = drm_format_to_dri_format(format); + + bo->priv = dri->image_extension->createImageWithModifiers( + dri->device, width, height, dri_format, modifiers, modifier_count, NULL); + if (!bo->priv) { ret = -errno; - goto free_image; + return ret; } - bo->strides[0] = stride; - bo->sizes[0] = stride * height; - bo->offsets[0] = offset; - bo->total_size = offset + bo->sizes[0]; + ret = import_into_minigbm(dri, bo); + if (ret) + goto free_image; + return 0; free_image: @@ -218,16 +346,41 @@ int dri_bo_import(struct bo *bo, struct drv_import_fd_data *data) int ret; struct dri_driver *dri = bo->drv->priv; - assert(bo->num_planes == 1); - - // clang-format off - bo->priv = dri->image_extension->createImageFromFds(dri->device, data->width, data->height, - data->format, data->fds, bo->num_planes, - (int *)data->strides, - (int *)data->offsets, NULL); - // clang-format on - if (!bo->priv) - return -errno; + if (data->format_modifiers[0] != DRM_FORMAT_MOD_INVALID) { + unsigned error; + + if (!dri->image_extension->createImageFromDmaBufs2) + return -ENOSYS; + + // clang-format off + bo->priv = dri->image_extension->createImageFromDmaBufs2(dri->device, data->width, data->height, + data->format, + data->format_modifiers[0], + data->fds, + bo->meta.num_planes, + (int *)data->strides, + (int *)data->offsets, + __DRI_YUV_COLOR_SPACE_UNDEFINED, + __DRI_YUV_RANGE_UNDEFINED, + __DRI_YUV_CHROMA_SITING_UNDEFINED, + __DRI_YUV_CHROMA_SITING_UNDEFINED, + &error, NULL); + // clang-format on + + /* Could translate the DRI error, but the Mesa GBM also returns ENOSYS. */ + if (!bo->priv) + return -ENOSYS; + } else { + // clang-format off + bo->priv = dri->image_extension->createImageFromFds(dri->device, data->width, data->height, + data->format, data->fds, + bo->meta.num_planes, + (int *)data->strides, + (int *)data->offsets, NULL); + // clang-format on + if (!bo->priv) + return -errno; + } ret = import_into_minigbm(dri, bo); if (ret) { @@ -243,6 +396,7 @@ int dri_bo_destroy(struct bo *bo) struct dri_driver *dri = bo->drv->priv; assert(bo->priv); + close_gem_handle(bo->handles[0].u32, bo->drv->fd); dri->image_extension->destroyImage(bo->priv); bo->priv = NULL; return 0; @@ -260,11 +414,11 @@ int dri_bo_destroy(struct bo *bo) void *dri_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags) { struct dri_driver *dri = bo->drv->priv; - int stride; /* GBM flags and DRI flags are the same. */ - vma->addr = dri->image_extension->mapImage(dri->context, bo->priv, 0, 0, bo->width, - bo->height, map_flags, &stride, &vma->priv); + vma->addr = dri->image_extension->mapImage(dri->context, bo->priv, 0, 0, bo->meta.width, + bo->meta.height, map_flags, + (int *)&vma->map_strides[plane], &vma->priv); if (!vma->addr) return MAP_FAILED; @@ -290,4 +444,22 @@ int dri_bo_unmap(struct bo *bo, struct vma *vma) return 0; } +size_t dri_num_planes_from_modifier(struct driver *drv, uint32_t format, uint64_t modifier) +{ + struct dri_driver *dri = drv->priv; + if (!dri->image_extension->queryDmaBufFormatModifierAttribs) { + /* We do not do any modifier checks here. The create will fail + * later if the modifier is not supported. */ + return drv_num_planes_from_format(format); + } + + uint64_t planes; + GLboolean ret = dri->image_extension->queryDmaBufFormatModifierAttribs( + dri->device, format, modifier, __DRI_IMAGE_ATTRIB_NUM_PLANES, &planes); + if (!ret) + return 0; + + return planes; +} + #endif