* DEALINGS IN THE SOFTWARE.
*/
+#include <cutils/properties.h>
#include <errno.h>
+#include <dirent.h>
#include <dlfcn.h>
#include <fcntl.h>
#include <xf86drm.h>
#include <stdbool.h>
+#include <stdio.h>
#include <sync/sync.h>
+#include <sys/types.h>
#include "loader.h"
#include "egl_dri2.h"
#include "egl_dri2_fallbacks.h"
+
+#ifdef HAVE_DRM_GRALLOC
+#include <gralloc_drm_handle.h>
#include "gralloc_drm.h"
+#endif /* HAVE_DRM_GRALLOC */
#define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1))
{ HAL_PIXEL_FORMAT_YCbCr_420_888, 0, 1, __DRI_IMAGE_FOURCC_YUV420 },
{ HAL_PIXEL_FORMAT_YCbCr_420_888, 1, 1, __DRI_IMAGE_FOURCC_YVU420 },
{ HAL_PIXEL_FORMAT_YV12, 1, 1, __DRI_IMAGE_FOURCC_YVU420 },
+ /* HACK: See droid_create_image_from_prime_fd() and
+ * https://issuetracker.google.com/32077885. */
+ { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0, 2, __DRI_IMAGE_FOURCC_NV12 },
+ { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 0, 1, __DRI_IMAGE_FOURCC_YUV420 },
+ { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_YVU420 },
+ { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_AYUV },
+ { HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, 1, 1, __DRI_IMAGE_FOURCC_XYUV8888 },
};
static int
switch (native) {
case HAL_PIXEL_FORMAT_RGBA_8888:
+ case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
+ /*
+ * HACK: Hardcode this to RGBX_8888 as per cros_gralloc hack.
+ * TODO: Remove this once https://issuetracker.google.com/32077885 is fixed.
+ */
case HAL_PIXEL_FORMAT_RGBX_8888:
case HAL_PIXEL_FORMAT_BGRA_8888:
bpp = 4;
case HAL_PIXEL_FORMAT_RGB_565: return __DRI_IMAGE_FOURCC_RGB565;
case HAL_PIXEL_FORMAT_BGRA_8888: return __DRI_IMAGE_FOURCC_ARGB8888;
case HAL_PIXEL_FORMAT_RGBA_8888: return __DRI_IMAGE_FOURCC_ABGR8888;
+ case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
+ /*
+ * HACK: Hardcode this to RGBX_8888 as per cros_gralloc hack.
+ * TODO: Remove this once https://issuetracker.google.com/32077885 is fixed.
+ */
case HAL_PIXEL_FORMAT_RGBX_8888: return __DRI_IMAGE_FOURCC_XBGR8888;
default:
_eglLog(_EGL_WARNING, "unsupported native buffer format 0x%x", native);
case HAL_PIXEL_FORMAT_BGRA_8888: return __DRI_IMAGE_FORMAT_ARGB8888;
case HAL_PIXEL_FORMAT_RGB_565: return __DRI_IMAGE_FORMAT_RGB565;
case HAL_PIXEL_FORMAT_RGBA_8888: return __DRI_IMAGE_FORMAT_ABGR8888;
+ case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
+ /*
+ * HACK: Hardcode this to RGBX_8888 as per cros_gralloc hack.
+ * TODO: Revert this once https://issuetracker.google.com/32077885 is fixed.
+ */
case HAL_PIXEL_FORMAT_RGBX_8888: return __DRI_IMAGE_FORMAT_XBGR8888;
default:
_eglLog(_EGL_WARNING, "unsupported native buffer format 0x%x", format);
return (handle && handle->numFds) ? handle->data[0] : -1;
}
+#ifdef HAVE_DRM_GRALLOC
static int
get_native_buffer_name(struct ANativeWindowBuffer *buf)
{
return gralloc_drm_get_gem_handle(buf->handle);
}
+#endif /* HAVE_DRM_GRALLOC */
static EGLBoolean
droid_window_dequeue_buffer(struct dri2_egl_surface *dri2_surf)
*/
mtx_unlock(&disp->Mutex);
- /* Queue the buffer without a sync fence. This informs the ANativeWindow
- * that it may access the buffer immediately.
+ /* Queue the buffer with stored out fence fd. The ANativeWindow or buffer
+ * consumer may choose to wait for the fence to signal before accessing
+ * it. If fence fd value is -1, buffer can be accessed by consumer
+ * immediately. Consumer or application shouldn't rely on timestamp
+ * associated with fence if the fence fd is -1.
*
- * From ANativeWindow::dequeueBuffer:
- *
- * The fenceFd argument specifies a libsync fence file descriptor for
- * a fence that must signal before the buffer can be accessed. If
- * the buffer can be accessed immediately then a value of -1 should
- * be used. The caller must not use the file descriptor after it
- * is passed to queueBuffer, and the ANativeWindow implementation
- * is responsible for closing it.
+ * Ownership of fd is transferred to consumer after queueBuffer and the
+ * consumer is responsible for closing it. Caller must not use the fd
+ * after passing it to queueBuffer.
*/
- int fence_fd = -1;
+ int fence_fd = dri2_surf->out_fence_fd;
+ dri2_surf->out_fence_fd = -1;
dri2_surf->window->queueBuffer(dri2_surf->window, dri2_surf->buffer,
fence_fd);
droid_window_cancel_buffer(struct dri2_egl_surface *dri2_surf)
{
int ret;
+ int fence_fd = dri2_surf->out_fence_fd;
- ret = dri2_surf->window->cancelBuffer(dri2_surf->window, dri2_surf->buffer, -1);
+ dri2_surf->out_fence_fd = -1;
+ ret = dri2_surf->window->cancelBuffer(dri2_surf->window,
+ dri2_surf->buffer, fence_fd);
if (ret < 0) {
_eglLog(_EGL_WARNING, "ANativeWindow::cancelBuffer failed");
dri2_surf->base.Lost = EGL_TRUE;
}
}
-static __DRIbuffer *
-droid_alloc_local_buffer(struct dri2_egl_surface *dri2_surf,
- unsigned int att, unsigned int format)
+static bool
+droid_set_shared_buffer_mode(_EGLDisplay *disp, _EGLSurface *surf, bool mode)
{
- struct dri2_egl_display *dri2_dpy =
- dri2_egl_display(dri2_surf->base.Resource.Display);
-
- if (att >= ARRAY_SIZE(dri2_surf->local_buffers))
- return NULL;
-
- if (!dri2_surf->local_buffers[att]) {
- dri2_surf->local_buffers[att] =
- dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen, att, format,
- dri2_surf->base.Width, dri2_surf->base.Height);
- }
+#if ANDROID_API_LEVEL >= 24
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
+ struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
+ struct ANativeWindow *window = dri2_surf->window;
- return dri2_surf->local_buffers[att];
-}
+ assert(surf->Type == EGL_WINDOW_BIT);
+ assert(_eglSurfaceHasMutableRenderBuffer(&dri2_surf->base));
-static void
-droid_free_local_buffers(struct dri2_egl_surface *dri2_surf)
-{
- struct dri2_egl_display *dri2_dpy =
- dri2_egl_display(dri2_surf->base.Resource.Display);
+ _eglLog(_EGL_DEBUG, "%s: mode=%d", __func__, mode);
- for (int i = 0; i < ARRAY_SIZE(dri2_surf->local_buffers); i++) {
- if (dri2_surf->local_buffers[i]) {
- dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen,
- dri2_surf->local_buffers[i]);
- dri2_surf->local_buffers[i] = NULL;
- }
+ if (native_window_set_shared_buffer_mode(window, mode)) {
+ _eglLog(_EGL_WARNING, "failed native_window_set_shared_buffer_mode"
+ "(window=%p, mode=%d)", window, mode);
+ return false;
}
+
+ return true;
+#else
+ _eglLog(_EGL_FATAL, "%s:%d: internal error: unreachable", __FILE__, __LINE__);
+ return false;
+#endif
}
static _EGLSurface *
return NULL;
}
- if (!_eglInitSurface(&dri2_surf->base, disp, type, conf, attrib_list))
+ if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list, true))
goto cleanup_surface;
if (type == EGL_WINDOW_BIT) {
int format;
- if (!window || window->common.magic != ANDROID_NATIVE_WINDOW_MAGIC) {
+ if (window->common.magic != ANDROID_NATIVE_WINDOW_MAGIC) {
_eglError(EGL_BAD_NATIVE_WINDOW, "droid_create_surface");
goto cleanup_surface;
}
config = dri2_get_dri_config(dri2_conf, type,
dri2_surf->base.GLColorspace);
- if (!config)
+ if (!config) {
+ _eglError(EGL_BAD_MATCH, "Unsupported surfacetype/colorspace configuration");
goto cleanup_surface;
+ }
if (dri2_dpy->image_driver)
createNewDrawable = dri2_dpy->image_driver->createNewDrawable;
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
- droid_free_local_buffers(dri2_surf);
+ dri2_egl_surface_free_local_buffers(dri2_surf);
if (dri2_surf->base.Type == EGL_WINDOW_BIT) {
if (dri2_surf->buffer)
dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable);
+ dri2_fini_surface(surf);
free(dri2_surf);
return EGL_TRUE;
}
+static EGLBoolean
+droid_swap_interval(_EGLDriver *drv, _EGLDisplay *disp,
+ _EGLSurface *surf, EGLint interval)
+{
+ struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
+ struct ANativeWindow *window = dri2_surf->window;
+
+ if (window->setSwapInterval(window, interval))
+ return EGL_FALSE;
+
+ surf->SwapInterval = interval;
+ return EGL_TRUE;
+}
+
static int
update_buffers(struct dri2_egl_surface *dri2_surf)
{
/* free outdated buffers and update the surface size */
if (dri2_surf->base.Width != dri2_surf->buffer->width ||
dri2_surf->base.Height != dri2_surf->buffer->height) {
- droid_free_local_buffers(dri2_surf);
+ dri2_egl_surface_free_local_buffers(dri2_surf);
dri2_surf->base.Width = dri2_surf->buffer->width;
dri2_surf->base.Height = dri2_surf->buffer->height;
}
if (update_buffers(dri2_surf) < 0)
return 0;
+ if (_eglSurfaceInSharedBufferMode(&dri2_surf->base)) {
+ if (get_back_bo(dri2_surf) < 0)
+ return 0;
+
+ /* We have dri_image_back because this is a window surface and
+ * get_back_bo() succeeded.
+ */
+ assert(dri2_surf->dri_image_back);
+ images->back = dri2_surf->dri_image_back;
+ images->image_mask |= __DRI_IMAGE_BUFFER_SHARED;
+
+ /* There exists no accompanying back nor front buffer. */
+ return 1;
+ }
+
if (buffer_mask & __DRI_IMAGE_BUFFER_FRONT) {
if (get_front_bo(dri2_surf, format) < 0)
return 0;
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
+ const bool has_mutable_rb = _eglSurfaceHasMutableRenderBuffer(draw);
- if (dri2_surf->base.Type != EGL_WINDOW_BIT)
+ /* From the EGL_KHR_mutable_render_buffer spec (v12):
+ *
+ * If surface is a single-buffered window, pixmap, or pbuffer surface
+ * for which there is no pending change to the EGL_RENDER_BUFFER
+ * attribute, eglSwapBuffers has no effect.
+ */
+ if (has_mutable_rb &&
+ draw->RequestedRenderBuffer == EGL_SINGLE_BUFFER &&
+ draw->ActiveRenderBuffer == EGL_SINGLE_BUFFER) {
+ _eglLog(_EGL_DEBUG, "%s: remain in shared buffer mode", __func__);
return EGL_TRUE;
+ }
for (int i = 0; i < ARRAY_SIZE(dri2_surf->color_buffers); i++) {
if (dri2_surf->color_buffers[i].age > 0)
dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
+ /* Update the shared buffer mode */
+ if (has_mutable_rb &&
+ draw->ActiveRenderBuffer != draw->RequestedRenderBuffer) {
+ bool mode = (draw->RequestedRenderBuffer == EGL_SINGLE_BUFFER);
+ _eglLog(_EGL_DEBUG, "%s: change to shared buffer mode %d",
+ __func__, mode);
+
+ if (!droid_set_shared_buffer_mode(disp, draw, mode))
+ return EGL_FALSE;
+ draw->ActiveRenderBuffer = draw->RequestedRenderBuffer;
+ }
+
return EGL_TRUE;
}
return EGL_TRUE;
droid_rects = malloc(n_rects * sizeof(android_native_rect_t));
- if (droid_rects == NULL) {
- _eglError(EGL_BAD_ALLOC, "eglSetDamageRegionKHR");
- return EGL_FALSE;
- }
+ if (droid_rects == NULL)
+ return _eglError(EGL_BAD_ALLOC, "eglSetDamageRegionKHR");
for (EGLint num_drects = 0; num_drects < n_rects; num_drects++) {
EGLint i = num_drects * 4;
ret = dri2_dpy->gralloc->lock_ycbcr(dri2_dpy->gralloc, buf->handle,
0, 0, 0, 0, 0, &ycbcr);
if (ret) {
+ /* HACK: See droid_create_image_from_prime_fd() and
+ * https://issuetracker.google.com/32077885.*/
+ if (buf->format == HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED)
+ return NULL;
+
_eglLog(_EGL_WARNING, "gralloc->lock_ycbcr failed: %d", ret);
return NULL;
}
{
unsigned int pitch;
- if (is_yuv(buf->format))
- return droid_create_image_from_prime_fd_yuv(disp, ctx, buf, fd);
+ if (is_yuv(buf->format)) {
+ _EGLImage *image;
+
+ image = droid_create_image_from_prime_fd_yuv(disp, ctx, buf, fd);
+ /*
+ * HACK: https://issuetracker.google.com/32077885
+ * There is no API available to properly query the IMPLEMENTATION_DEFINED
+ * format. As a workaround we rely here on gralloc allocating either
+ * an arbitrary YCbCr 4:2:0 or RGBX_8888, with the latter being recognized
+ * by lock_ycbcr failing.
+ */
+ if (image || buf->format != HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED)
+ return image;
+ }
const int fourcc = get_fourcc(buf->format);
if (fourcc == -1) {
return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list);
}
+#ifdef HAVE_DRM_GRALLOC
static _EGLImage *
droid_create_image_from_name(_EGLDisplay *disp, _EGLContext *ctx,
struct ANativeWindowBuffer *buf)
return NULL;
}
- if (!_eglInitImage(&dri2_img->base, disp)) {
- free(dri2_img);
- return NULL;
- }
+ _eglInitImage(&dri2_img->base, disp);
dri2_img->dri_image =
dri2_dpy->image->createImageFromName(dri2_dpy->dri_screen,
return &dri2_img->base;
}
+#endif /* HAVE_DRM_GRALLOC */
static EGLBoolean
-droid_query_surface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surf,
+droid_query_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint attribute, EGLint *value)
{
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
default:
break;
}
- return _eglQuerySurface(drv, dpy, surf, attribute, value);
+ return _eglQuerySurface(drv, disp, surf, attribute, value);
}
static _EGLImage *
if (fd >= 0)
return droid_create_image_from_prime_fd(disp, ctx, buf, fd);
+#ifdef HAVE_DRM_GRALLOC
return droid_create_image_from_name(disp, ctx, buf);
+#else
+ return NULL;
+#endif
}
static _EGLImage *
{
}
+#ifdef HAVE_DRM_GRALLOC
static int
droid_get_buffers_parse_attachments(struct dri2_egl_surface *dri2_surf,
unsigned int *attachments, int count)
case __DRI_BUFFER_ACCUM:
case __DRI_BUFFER_DEPTH_STENCIL:
case __DRI_BUFFER_HIZ:
- local = droid_alloc_local_buffer(dri2_surf,
+ local = dri2_egl_surface_alloc_local_buffer(dri2_surf,
attachments[i], attachments[i + 1]);
if (local) {
if (update_buffers(dri2_surf) < 0)
return NULL;
- dri2_surf->buffer_count =
- droid_get_buffers_parse_attachments(dri2_surf, attachments, count);
+ *out_count = droid_get_buffers_parse_attachments(dri2_surf, attachments, count);
if (width)
*width = dri2_surf->base.Width;
if (height)
*height = dri2_surf->base.Height;
- *out_count = dri2_surf->buffer_count;
-
return dri2_surf->buffers;
}
+#endif /* HAVE_DRM_GRALLOC */
+
+static unsigned
+droid_get_capability(void *loaderPrivate, enum dri_loader_cap cap)
+{
+ /* Note: loaderPrivate is _EGLDisplay* */
+ switch (cap) {
+ case DRI_LOADER_CAP_RGBA_ORDERING:
+ return 1;
+ default:
+ return 0;
+ }
+}
static EGLBoolean
-droid_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy)
+droid_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp)
{
- struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
static const struct {
int format;
unsigned int rgba_masks[4];
};
struct dri2_egl_config *dri2_conf =
- dri2_add_config(dpy, dri2_dpy->driver_configs[j],
+ dri2_add_config(disp, dri2_dpy->driver_configs[j],
config_count + 1, surface_type, config_attrs,
visuals[i].rgba_masks);
if (dri2_conf) {
return (config_count != 0);
}
-static int
-droid_open_device(struct dri2_egl_display *dri2_dpy)
+static EGLBoolean
+droid_probe_device(_EGLDisplay *disp);
+
+#ifdef HAVE_DRM_GRALLOC
+static EGLBoolean
+droid_open_device_drm_gralloc(_EGLDisplay *disp)
{
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
int fd = -1, err = -EINVAL;
if (dri2_dpy->gralloc->perform)
&fd);
if (err || fd < 0) {
_eglLog(_EGL_WARNING, "fail to get drm fd");
- fd = -1;
+ return EGL_FALSE;
}
- return (fd >= 0) ? fcntl(fd, F_DUPFD_CLOEXEC, 3) : -1;
+ dri2_dpy->fd = fcntl(fd, F_DUPFD_CLOEXEC, 3);
+ if (dri2_dpy->fd < 0)
+ return EGL_FALSE;
+
+ return droid_probe_device(disp);
}
+#endif /* HAVE_DRM_GRALLOC */
static const struct dri2_egl_display_vtbl droid_display_vtbl = {
.authenticate = NULL,
.create_pbuffer_surface = droid_create_pbuffer_surface,
.destroy_surface = droid_destroy_surface,
.create_image = droid_create_image_khr,
- .swap_interval = dri2_fallback_swap_interval,
.swap_buffers = droid_swap_buffers,
- .swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage,
+ .swap_buffers_with_damage = dri2_fallback_swap_buffers_with_damage, /* Android implements the function */
.swap_buffers_region = dri2_fallback_swap_buffers_region,
+ .swap_interval = droid_swap_interval,
#if ANDROID_API_LEVEL >= 23
.set_damage_region = droid_set_damage_region,
#else
.create_wayland_buffer_from_image = dri2_fallback_create_wayland_buffer_from_image,
.get_sync_values = dri2_fallback_get_sync_values,
.get_dri_drawable = dri2_surface_get_dri_drawable,
+ .set_shared_buffer_mode = droid_set_shared_buffer_mode,
};
+#ifdef HAVE_DRM_GRALLOC
static const __DRIdri2LoaderExtension droid_dri2_loader_extension = {
- .base = { __DRI_DRI2_LOADER, 3 },
+ .base = { __DRI_DRI2_LOADER, 4 },
.getBuffers = NULL,
.flushFrontBuffer = droid_flush_front_buffer,
.getBuffersWithFormat = droid_get_buffers_with_format,
+ .getCapability = droid_get_capability,
};
+#endif /* HAVE_DRM_GRALLOC */
static const __DRIimageLoaderExtension droid_image_loader_extension = {
- .base = { __DRI_IMAGE_LOADER, 1 },
+ .base = { __DRI_IMAGE_LOADER, 2 },
.getBuffers = droid_image_get_buffers,
.flushFrontBuffer = droid_flush_front_buffer,
+ .getCapability = droid_get_capability,
};
+#ifdef HAVE_DRM_GRALLOC
static const __DRIextension *droid_dri2_loader_extensions[] = {
&droid_dri2_loader_extension.base,
&image_lookup_extension.base,
&use_invalidate.base,
+ /* No __DRI_MUTABLE_RENDER_BUFFER_LOADER because it requires
+ * __DRI_IMAGE_LOADER.
+ */
NULL,
};
+#endif /* HAVE_DRM_GRALLOC */
+
+static void
+droid_display_shared_buffer(__DRIdrawable *driDrawable, int fence_fd,
+ void *loaderPrivate)
+{
+ struct dri2_egl_surface *dri2_surf = loaderPrivate;
+ struct ANativeWindowBuffer *old_buffer UNUSED = dri2_surf->buffer;
+
+ if (!_eglSurfaceInSharedBufferMode(&dri2_surf->base)) {
+ _eglLog(_EGL_WARNING, "%s: internal error: buffer is not shared",
+ __func__);
+ return;
+ }
+
+ if (fence_fd >= 0) {
+ /* The driver's fence is more recent than the surface's out fence, if it
+ * exists at all. So use the driver's fence.
+ */
+ if (dri2_surf->out_fence_fd >= 0) {
+ close(dri2_surf->out_fence_fd);
+ dri2_surf->out_fence_fd = -1;
+ }
+ } else if (dri2_surf->out_fence_fd >= 0) {
+ fence_fd = dri2_surf->out_fence_fd;
+ dri2_surf->out_fence_fd = -1;
+ }
+
+ if (dri2_surf->window->queueBuffer(dri2_surf->window, dri2_surf->buffer,
+ fence_fd)) {
+ _eglLog(_EGL_WARNING, "%s: ANativeWindow::queueBuffer failed", __func__);
+ close(fence_fd);
+ return;
+ }
+
+ fence_fd = -1;
+
+ if (dri2_surf->window->dequeueBuffer(dri2_surf->window, &dri2_surf->buffer,
+ &fence_fd)) {
+ /* Tear down the surface because it no longer has a back buffer. */
+ struct dri2_egl_display *dri2_dpy =
+ dri2_egl_display(dri2_surf->base.Resource.Display);
+
+ _eglLog(_EGL_WARNING, "%s: ANativeWindow::dequeueBuffer failed", __func__);
+
+ dri2_surf->base.Lost = true;
+ dri2_surf->buffer = NULL;
+ dri2_surf->back = NULL;
+
+ if (dri2_surf->dri_image_back) {
+ dri2_dpy->image->destroyImage(dri2_surf->dri_image_back);
+ dri2_surf->dri_image_back = NULL;
+ }
+
+ dri2_dpy->flush->invalidate(dri2_surf->dri_drawable);
+ return;
+ }
+
+ if (fence_fd < 0)
+ return;
+
+ /* Access to the buffer is controlled by a sync fence. Block on it.
+ *
+ * Ideally, we would submit the fence to the driver, and the driver would
+ * postpone command execution until it signalled. But DRI lacks API for
+ * that (as of 2018-04-11).
+ *
+ * SYNC_IOC_WAIT waits forever if timeout < 0
+ */
+ sync_wait(fence_fd, -1);
+ close(fence_fd);
+}
+
+static const __DRImutableRenderBufferLoaderExtension droid_mutable_render_buffer_extension = {
+ .base = { __DRI_MUTABLE_RENDER_BUFFER_LOADER, 1 },
+ .displaySharedBuffer = droid_display_shared_buffer,
+};
static const __DRIextension *droid_image_loader_extensions[] = {
&droid_image_loader_extension.base,
&image_lookup_extension.base,
&use_invalidate.base,
+ &droid_mutable_render_buffer_extension.base,
NULL,
};
+static EGLBoolean
+droid_load_driver(_EGLDisplay *disp)
+{
+ struct dri2_egl_display *dri2_dpy = disp->DriverData;
+ const char *err;
+
+ dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
+ if (dri2_dpy->driver_name == NULL)
+ return false;
+
+ dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
+
+ if (!dri2_dpy->is_render_node) {
+#ifdef HAVE_DRM_GRALLOC
+ /* Handle control nodes using __DRI_DRI2_LOADER extension and GEM names
+ * for backwards compatibility with drm_gralloc. (Do not use on new
+ * systems.) */
+ dri2_dpy->loader_extensions = droid_dri2_loader_extensions;
+ if (!dri2_load_driver(disp)) {
+ err = "DRI2: failed to load driver";
+ goto error;
+ }
+#else
+ err = "DRI2: handle is not for a render node";
+ goto error;
+#endif
+ } else {
+ dri2_dpy->loader_extensions = droid_image_loader_extensions;
+ if (!dri2_load_driver_dri3(disp)) {
+ err = "DRI3: failed to load driver";
+ goto error;
+ }
+ }
+
+ return true;
+
+error:
+ free(dri2_dpy->driver_name);
+ dri2_dpy->driver_name = NULL;
+ return false;
+}
+
+static void
+droid_unload_driver(_EGLDisplay *disp)
+{
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
+
+ dlclose(dri2_dpy->driver);
+ dri2_dpy->driver = NULL;
+ free(dri2_dpy->driver_name);
+ dri2_dpy->driver_name = NULL;
+}
+
+static int
+droid_filter_device(_EGLDisplay *disp, int fd, const char *vendor)
+{
+ drmVersionPtr ver = drmGetVersion(fd);
+ if (!ver)
+ return -1;
+
+ if (strcmp(vendor, ver->name) != 0) {
+ drmFreeVersion(ver);
+ return -1;
+ }
+
+ drmFreeVersion(ver);
+ return 0;
+}
+
+static EGLBoolean
+droid_probe_device(_EGLDisplay *disp)
+{
+ /* Check that the device is supported, by attempting to:
+ * - load the dri module
+ * - and, create a screen
+ */
+ if (!droid_load_driver(disp))
+ return EGL_FALSE;
+
+ if (!dri2_create_screen(disp)) {
+ _eglLog(_EGL_WARNING, "DRI2: failed to create screen");
+ droid_unload_driver(disp);
+ return EGL_FALSE;
+ }
+ return EGL_TRUE;
+}
+
+static EGLBoolean
+droid_open_device(_EGLDisplay *disp)
+{
+#define MAX_DRM_DEVICES 64
+ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
+ drmDevicePtr device, devices[MAX_DRM_DEVICES] = { NULL };
+ int num_devices;
+
+ char *vendor_name = NULL;
+ char vendor_buf[PROPERTY_VALUE_MAX];
+
+ if (property_get("drm.gpu.vendor_name", vendor_buf, NULL) > 0)
+ vendor_name = vendor_buf;
+
+ num_devices = drmGetDevices2(0, devices, ARRAY_SIZE(devices));
+ if (num_devices < 0)
+ return EGL_FALSE;
+
+ for (int i = 0; i < num_devices; i++) {
+ device = devices[i];
+
+ if (!(device->available_nodes & (1 << DRM_NODE_RENDER)))
+ continue;
+
+ dri2_dpy->fd = loader_open_device(device->nodes[DRM_NODE_RENDER]);
+ if (dri2_dpy->fd < 0) {
+ _eglLog(_EGL_WARNING, "%s() Failed to open DRM device %s",
+ __func__, device->nodes[DRM_NODE_RENDER]);
+ continue;
+ }
+
+ /* If a vendor is explicitly provided, we use only that.
+ * Otherwise we fall-back the first device that is supported.
+ */
+ if (vendor_name) {
+ if (droid_filter_device(disp, dri2_dpy->fd, vendor_name)) {
+ /* Device does not match - try next device */
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
+ continue;
+ }
+ /* If the requested device matches - use it. Regardless if
+ * init fails, do not fall-back to any other device.
+ */
+ if (!droid_probe_device(disp)) {
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
+ }
+
+ break;
+ }
+ if (droid_probe_device(disp))
+ break;
+
+ /* No explicit request - attempt the next device */
+ close(dri2_dpy->fd);
+ dri2_dpy->fd = -1;
+ }
+ drmFreeDevices(devices, num_devices);
+
+ if (dri2_dpy->fd < 0) {
+ _eglLog(_EGL_WARNING, "Failed to open %s DRM device",
+ vendor_name ? "desired": "any");
+ return EGL_FALSE;
+ }
+
+ return EGL_TRUE;
+#undef MAX_DRM_DEVICES
+}
+
EGLBoolean
-dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *dpy)
+dri2_initialize_android(_EGLDriver *drv, _EGLDisplay *disp)
{
+ _EGLDevice *dev;
struct dri2_egl_display *dri2_dpy;
const char *err;
int ret;
- loader_set_logger(_eglLog);
+ /* Not supported yet */
+ if (disp->Options.ForceSoftware)
+ return EGL_FALSE;
dri2_dpy = calloc(1, sizeof(*dri2_dpy));
if (!dri2_dpy)
goto cleanup;
}
- dpy->DriverData = (void *) dri2_dpy;
+ disp->DriverData = (void *) dri2_dpy;
- dri2_dpy->fd = droid_open_device(dri2_dpy);
- if (dri2_dpy->fd < 0) {
+#ifdef HAVE_DRM_GRALLOC
+ if (!droid_open_device_drm_gralloc(disp)) {
+#else
+ if (!droid_open_device(disp)) {
+#endif
err = "DRI2: failed to open device";
goto cleanup;
}
- dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd);
- if (dri2_dpy->driver_name == NULL) {
- err = "DRI2: failed to get driver name";
+ dev = _eglAddDevice(dri2_dpy->fd, false);
+ if (!dev) {
+ err = "DRI2: failed to find EGLDevice";
goto cleanup;
}
- dri2_dpy->is_render_node = drmGetNodeTypeFromFd(dri2_dpy->fd) == DRM_NODE_RENDER;
+ disp->Device = dev;
- /* render nodes cannot use Gem names, and thus do not support
- * the __DRI_DRI2_LOADER extension */
- if (!dri2_dpy->is_render_node) {
- dri2_dpy->loader_extensions = droid_dri2_loader_extensions;
- if (!dri2_load_driver(dpy)) {
- err = "DRI2: failed to load driver";
- goto cleanup;
- }
- } else {
- dri2_dpy->loader_extensions = droid_image_loader_extensions;
- if (!dri2_load_driver_dri3(dpy)) {
- err = "DRI3: failed to load driver";
- goto cleanup;
- }
- }
-
- if (!dri2_create_screen(dpy)) {
- err = "DRI2: failed to create screen";
+ if (!dri2_setup_extensions(disp)) {
+ err = "DRI2: failed to setup extensions";
goto cleanup;
}
- if (!dri2_setup_extensions(dpy))
- goto cleanup;
+ dri2_setup_screen(disp);
+
+ /* We set the maximum swap interval as 1 for Android platform, since it is
+ * the maximum value supported by Android according to the value of
+ * ANativeWindow::maxSwapInterval.
+ */
+ dri2_setup_swap_interval(disp, 1);
- dri2_setup_screen(dpy);
+ disp->Extensions.ANDROID_framebuffer_target = EGL_TRUE;
+ disp->Extensions.ANDROID_image_native_buffer = EGL_TRUE;
+ disp->Extensions.ANDROID_recordable = EGL_TRUE;
+ disp->Extensions.EXT_buffer_age = EGL_TRUE;
+#if ANDROID_API_LEVEL >= 23
+ disp->Extensions.KHR_partial_update = EGL_TRUE;
+#endif
+ disp->Extensions.KHR_image = EGL_TRUE;
+#if ANDROID_API_LEVEL >= 24
+ if (dri2_dpy->mutable_render_buffer &&
+ dri2_dpy->loader_extensions == droid_image_loader_extensions) {
+ disp->Extensions.KHR_mutable_render_buffer = EGL_TRUE;
+ }
+#endif
- if (!droid_add_configs_for_visuals(drv, dpy)) {
+ /* Create configs *after* enabling extensions because presence of DRI
+ * driver extensions can affect the capabilities of EGLConfigs.
+ */
+ if (!droid_add_configs_for_visuals(drv, disp)) {
err = "DRI2: failed to add configs";
goto cleanup;
}
- dpy->Extensions.ANDROID_framebuffer_target = EGL_TRUE;
- dpy->Extensions.ANDROID_image_native_buffer = EGL_TRUE;
- dpy->Extensions.ANDROID_recordable = EGL_TRUE;
- dpy->Extensions.EXT_buffer_age = EGL_TRUE;
-#if ANDROID_API_LEVEL >= 23
- dpy->Extensions.KHR_partial_update = EGL_TRUE;
-#endif
-
/* Fill vtbl last to prevent accidentally calling virtual function during
* initialization.
*/
return EGL_TRUE;
cleanup:
- dri2_display_destroy(dpy);
+ dri2_display_destroy(disp);
return _eglError(EGL_NOT_INITIALIZED, err);
}
projects / mesa.git / blobdiff