From db687011e00b607a619a04710567bd091702cb49 Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers Date: Mon, 25 Nov 2013 14:59:10 +1100 Subject: gallium/radeon: Implement hooks for DRI Image 7 (v2) v2: Fix transliteration of lseek arguments Ignore busy return from RADEON_GEM_BUSY ioctl; we're only after the domain Signed-off-by: Christopher James Halse Rogers Reviewed-by: Thomas Hellstrom Signed-off-by: Maarten Lankhorst --- src/gallium/targets/r300/common/drm_target.c | 27 +++++++++++++++++++++++- src/gallium/targets/r600/common/drm_target.c | 16 ++++++++++++++ src/gallium/targets/radeonsi/common/drm_target.c | 16 ++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) (limited to 'src/gallium/targets') diff --git a/src/gallium/targets/r300/common/drm_target.c b/src/gallium/targets/r300/common/drm_target.c index 2c10bbd7bb1..9b484469d47 100644 --- a/src/gallium/targets/r300/common/drm_target.c +++ b/src/gallium/targets/r300/common/drm_target.c @@ -51,4 +51,29 @@ create_screen(int fd) return sws->screen; } -DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL) +/* Technically this is only true for kernels >= 3.12, which + * support lseek on dma-buf fds. + * + * We could check for this in create_screen and return the correct + * value, but for now just return true in all cases. + * + * createImageFromFds fails gracefully on kernel < 3.12, so this + * shouldn't be a huge problem. + */ +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("r300", "radeon", create_screen, drm_configuration) diff --git a/src/gallium/targets/r600/common/drm_target.c b/src/gallium/targets/r600/common/drm_target.c index 28004ac58e2..ab1eec6ac9a 100644 --- a/src/gallium/targets/r600/common/drm_target.c +++ b/src/gallium/targets/r600/common/drm_target.c @@ -55,11 +55,27 @@ static const struct drm_conf_ret throttle_ret = { .val.val_int = 2, }; +/* Technically this is only true for kernels >= 3.12, which + * support lseek on dma-buf fds. + * + * We could check for this in create_screen and return the correct + * value, but for now just return true in all cases. + * + * createImageFromFds fails gracefully on kernel < 3.12, so this + * shouldn't be a huge problem. + */ +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; } diff --git a/src/gallium/targets/radeonsi/common/drm_target.c b/src/gallium/targets/radeonsi/common/drm_target.c index 9eef368529f..08ff47dfb68 100644 --- a/src/gallium/targets/radeonsi/common/drm_target.c +++ b/src/gallium/targets/radeonsi/common/drm_target.c @@ -55,11 +55,27 @@ static const struct drm_conf_ret throttle_ret = { .val.val_int = 2, }; +/* Technically this is only true for kernels >= 3.12, which + * support lseek on dma-buf fds. + * + * We could check for this in create_screen and return the correct + * value, but for now just return true in all cases. + * + * createImageFromFds fails gracefully on kernel < 3.12, so this + * shouldn't be a huge problem. + */ +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; } -- cgit v1.2.3