From 839f41763436cd1a438771f50ffa16fa3bbbb3c5 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Sat, 7 May 2016 11:33:24 +0200 Subject: [PATCH] st/nine: Turn on thread_submit by default when on different device The last remaining issues with thread_submit have been resolved, thus turn it when on a different device (the case where is is beneficial). Signed-off-by: Axel Davy --- src/gallium/targets/d3dadapter9/drm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index 233db8ae372..767a17a55da 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -265,18 +265,20 @@ drm_create_adapter( int fd, else ctx->base.vblank_mode = 1; - if (driCheckOption(&userInitOptions, "thread_submit", DRI_BOOL)) { + if (driCheckOption(&userInitOptions, "thread_submit", DRI_BOOL)) ctx->base.thread_submit = driQueryOptionb(&userInitOptions, "thread_submit"); - if (ctx->base.thread_submit && (throttling_value_user == -2 || throttling_value_user == 0)) { - ctx->base.throttling_value = 0; - } else if (ctx->base.thread_submit) { - DBG("You have set a non standard throttling value in combination with thread_submit." - "We advise to use a throttling value of -2/0"); - } - if (ctx->base.thread_submit && !different_device) - DBG("You have set thread_submit but do not use a different device than the server." - "You should not expect any benefit."); + else + ctx->base.thread_submit = !!different_device; + + if (ctx->base.thread_submit && (throttling_value_user == -2 || throttling_value_user == 0)) { + ctx->base.throttling_value = 0; + } else if (ctx->base.thread_submit) { + DBG("You have set a non standard throttling value in combination with thread_submit." + "We advise to use a throttling value of -2/0"); } + if (ctx->base.thread_submit && !different_device) + DBG("You have set thread_submit but do not use a different device than the server." + "You should not expect any benefit."); if (driCheckOption(&userInitOptions, "override_vendorid", DRI_INT)) { override_vendorid = driQueryOptioni(&userInitOptions, "override_vendorid"); -- 2.30.2