fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: store reference to the context within struct brw_fence (v2)

Browse source 
As the spec allows for {server,client}_wait_sync to be called without
currently bound context, while our implementation requires context
pointer.

v2: Add a mutex and acquire it for the duration of
    brw_fence_client_wait() and brw_fence_is_completed() as suggested
    by Chad.

Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
(cherry picked from commit 4f48674d51)
This commit is contained in:
Emil Velikov 2016-07-15 16:27:09 +09:00
parent de695014eb
commit bb0c49bf76
1 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/mesa/drivers/dri/i965/intel_syncobj.c
View file

@ -45,9 +45,11 @@
#include "intel_reg.h" #include "intel_reg.h"
struct brw_fence { struct brw_fence {
struct brw_context *brw;
/** The fence waits for completion of this batch. */ /** The fence waits for completion of this batch. */
drm_intel_bo *batch_bo; drm_intel_bo *batch_bo;
mtx_t mutex;
bool signalled; bool signalled;
}; };
@ -76,7 +78,7 @@ brw_fence_insert(struct brw_context *brw, struct brw_fence *fence)
} }
static bool static bool
brw_fence_has_completed(struct brw_fence *fence) brw_fence_has_completed_locked(struct brw_fence *fence)
{ {
if (fence->signalled) if (fence->signalled)
return true; return true;
@ -91,13 +93,21 @@ brw_fence_has_completed(struct brw_fence *fence)
return false; return false;
} }
/**
* Return true if the function successfully signals or has already signalled.
* (This matches the behavior expected from __DRI2fence::client_wait_sync).
*/
static bool static bool
brw_fence_client_wait(struct brw_context *brw, struct brw_fence *fence, brw_fence_has_completed(struct brw_fence *fence)
uint64_t timeout) {
bool ret;
mtx_lock(&fence->mutex);
ret = brw_fence_has_completed_locked(fence);
mtx_unlock(&fence->mutex);
return ret;
}
static bool
brw_fence_client_wait_locked(struct brw_context *brw, struct brw_fence *fence,
uint64_t timeout)
{ {
if (fence->signalled) if (fence->signalled)
return true; return true;
@ -122,6 +132,23 @@ brw_fence_client_wait(struct brw_context *brw, struct brw_fence *fence,
return true; return true;
} }
/**
* Return true if the function successfully signals or has already signalled.
* (This matches the behavior expected from __DRI2fence::client_wait_sync).
*/
static bool
brw_fence_client_wait(struct brw_context *brw, struct brw_fence *fence,
uint64_t timeout)
{
bool ret;
mtx_lock(&fence->mutex);
ret = brw_fence_client_wait_locked(brw, fence, timeout);
mtx_unlock(&fence->mutex);
return ret;
}
static void static void
brw_fence_server_wait(struct brw_context *brw, struct brw_fence *fence) brw_fence_server_wait(struct brw_context *brw, struct brw_fence *fence)
{ {
@ -214,6 +241,8 @@ intel_dri_create_fence(__DRIcontext *ctx)
if (!fence) if (!fence)
return NULL; return NULL;
mtx_init(&fence->mutex, mtx_plain);
fence->brw = brw;
brw_fence_insert(brw, fence); brw_fence_insert(brw, fence);
return fence; return fence;
@ -232,19 +261,23 @@ static GLboolean
intel_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags, intel_dri_client_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags,
uint64_t timeout) uint64_t timeout)
{ {
struct brw_context *brw = ctx->driverPrivate;
struct brw_fence *fence = driver_fence; struct brw_fence *fence = driver_fence;
return brw_fence_client_wait(brw, fence, timeout); return brw_fence_client_wait(fence->brw, fence, timeout);
} }
static void static void
intel_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags) intel_dri_server_wait_sync(__DRIcontext *ctx, void *driver_fence, unsigned flags)
{ {
struct brw_context *brw = ctx->driverPrivate;
struct brw_fence *fence = driver_fence; struct brw_fence *fence = driver_fence;
brw_fence_server_wait(brw, fence); /* We might be called here with a NULL fence as a result of WaitSyncKHR
* on a EGL_KHR_reusable_sync fence. Nothing to do here in such case.
*/
if (!fence)
return;
brw_fence_server_wait(fence->brw, fence);
} }
const __DRI2fenceExtension intelFenceExtension = { const __DRI2fenceExtension intelFenceExtension = {