KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i915g: Implement EGL_EXT_image_dma_buf_import 

This adds all the plumbing to get EGL_EXT_image_dma_buf_import in
i915g.

Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
This commit is contained in:
Stéphane Marchesin 2015-04-01 20:00:08 -07:00
parent a03d0ba78f
commit 70eed78cac
5 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/target-helpers/inline_drm_helper.h
View File

@ -430,7 +430,7 @@ dd_configuration(enum drm_conf conf)
#if defined(GALLIUM_I915)
if (strcmp(driver_name, "i915") == 0)
return NULL;
return configuration_query(conf);
else
#endif
#if defined(GALLIUM_ILO)

2
src/gallium/drivers/i915/i915_resource_texture.c
View File

@ -989,7 +989,7 @@ i915_texture_from_handle(struct pipe_screen * screen,
assert(screen);
buffer = iws->buffer_from_handle(iws, whandle, &tiling, &stride);
buffer = iws->buffer_from_handle(iws, whandle, template->height0, &tiling, &stride);
/* Only supports one type */
if ((template->target != PIPE_TEXTURE_2D &&

1
src/gallium/drivers/i915/i915_winsys.h
View File

@ -176,6 +176,7 @@ struct i915_winsys {
struct i915_winsys_buffer *
(*buffer_from_handle)(struct i915_winsys *iws,
struct winsys_handle *whandle,
unsigned height,
enum i915_winsys_buffer_tile *tiling,
unsigned *stride);

25
src/gallium/targets/pipe-loader/pipe_i915.c
View File

@ -23,5 +23,28 @@ create_screen(int fd)
return screen;
}
static const struct drm_conf_ret throttle_ret = {
.type = DRM_CONF_INT,
.val.val_int = 2,
};
static const struct drm_conf_ret share_fd_ret = {
.type = DRM_CONF_BOOL,
.val.val_int = true,
};
static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
{
switch (conf) {
case DRM_CONF_THROTTLE:
return &throttle_ret;
case DRM_CONF_SHARE_FD:
return &share_fd_ret;
default:
break;
}
return NULL;
}
PUBLIC
DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen, NULL)
DRM_DRIVER_DESCRIPTOR("i915", "i915", create_screen, drm_configuration)

15
src/gallium/winsys/i915/drm/i915_drm_buffer.c
View File

@ -1,4 +1,3 @@
#include "state_tracker/drm_driver.h"
#include "i915_drm_winsys.h"
#include "util/u_memory.h"
@ -72,7 +71,7 @@ i915_drm_buffer_create_tiled(struct i915_winsys *iws,
buf->bo = drm_intel_bo_alloc_tiled(idws->gem_manager,
i915_drm_type_to_name(type),
*stride, height, 1,
*stride, height, 1,
&tiling_mode, &pitch, 0);
if (!buf->bo)
@ -91,6 +90,7 @@ err:
static struct i915_winsys_buffer *
i915_drm_buffer_from_handle(struct i915_winsys *iws,
struct winsys_handle *whandle,
unsigned height,
enum i915_winsys_buffer_tile *tiling,
unsigned *stride)
{
@ -98,7 +98,7 @@ i915_drm_buffer_from_handle(struct i915_winsys *iws,
struct i915_drm_buffer *buf;
uint32_t tile = 0, swizzle = 0;
if (whandle->type != DRM_API_HANDLE_TYPE_SHARED)
if ((whandle->type != DRM_API_HANDLE_TYPE_SHARED) && (whandle->type != DRM_API_HANDLE_TYPE_FD))
return NULL;
buf = CALLOC_STRUCT(i915_drm_buffer);
@ -106,7 +106,14 @@ i915_drm_buffer_from_handle(struct i915_winsys *iws,
return NULL;
buf->magic = 0xDEAD1337;
buf->bo = drm_intel_bo_gem_create_from_name(idws->gem_manager, "gallium3d_from_handle", whandle->handle);
if (whandle->type == DRM_API_HANDLE_TYPE_SHARED)
buf->bo = drm_intel_bo_gem_create_from_name(idws->gem_manager, "gallium3d_from_handle", whandle->handle);
else if (whandle->type == DRM_API_HANDLE_TYPE_FD) {
int fd = (int) whandle->handle;
buf->bo = drm_intel_bo_gem_create_from_prime(idws->gem_manager, fd, height * whandle->stride);
}
buf->flinked = TRUE;
buf->flink = whandle->handle;