-
#include "state_tracker/drm_driver.h"
#include "i915_drm_winsys.h"
#include "util/u_memory.h"
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)
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)
{
struct i915_drm_winsys *idws = i915_drm_winsys(iws);
- struct i915_drm_buffer *buf = CALLOC_STRUCT(i915_drm_buffer);
+ struct i915_drm_buffer *buf;
uint32_t tile = 0, swizzle = 0;
+ if ((whandle->type != DRM_API_HANDLE_TYPE_SHARED) && (whandle->type != DRM_API_HANDLE_TYPE_FD))
+ return NULL;
+
+ buf = CALLOC_STRUCT(i915_drm_buffer);
if (!buf)
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;
struct i915_winsys_buffer *buffer)
{
struct i915_drm_buffer* i915_buffer = i915_drm_buffer(buffer);
+ if (!i915_buffer)
+ return FALSE;
return drm_intel_bo_busy(i915_buffer->bo);
}