From 7d2c1df99e09e6bfa6d03f880797071967557921 Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers Date: Thu, 21 Nov 2013 15:11:43 +1100 Subject: ilo: Support DRI Image 7 Signed-off-by: Christopher James Halse Rogers Reviewed-by: Thomas Hellstrom Signed-off-by: Maarten Lankhorst --- src/gallium/targets/dri-ilo/target.c | 19 ++++++++++++++++++- src/gallium/winsys/intel/drm/intel_drm_winsys.c | 2 -- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gallium/targets/dri-ilo/target.c b/src/gallium/targets/dri-ilo/target.c index 451827a4309..3ce75e96b2e 100644 --- a/src/gallium/targets/dri-ilo/target.c +++ b/src/gallium/targets/dri-ilo/target.c @@ -24,4 +24,21 @@ create_screen(int fd) return screen; } -DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, NULL) + +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_SHARE_FD: + return &share_fd_ret; + default: + break; + } + return NULL; +} + +DRM_DRIVER_DESCRIPTOR("i965", "i915", create_screen, drm_configuration) diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c index 521762d8f90..d7ec919130b 100644 --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c @@ -257,7 +257,6 @@ intel_winsys_import_handle(struct intel_winsys *winsys, name, gem_name); } break; -#if 0 case DRM_API_HANDLE_TYPE_FD: { const int fd = (int) handle->handle; @@ -265,7 +264,6 @@ intel_winsys_import_handle(struct intel_winsys *winsys, fd, height * handle->stride); } break; -#endif default: bo = NULL; break; -- cgit v1.2.3