diff options
| author | Rob Clark <robdclark@gmail.com> | 2017-05-26 10:18:31 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2017-05-28 14:49:27 -0400 |
| commit | 8fc9702a1b7027d266121713771eafd2aa1a93b6 (patch) | |
| tree | 8321f1a8a1f4fd2effc4d733239479bff6590642 | |
| parent | ab8fb5a082513bb699b224c52ac82779752608fb (diff) | |
freedreno: fix fence creation fail if no rendering
Android tries to create a FENCE_FD fence without any rendering. And
then falls over when that fails. So just always create an initial
batch.
Fixes: e4ad8695 ("freedreno: fix crash when flush() but no rendering")
Signed-off-by: Rob Clark <robdclark@gmail.com>
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_context.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c index 450f4a803ed..1cf366b0c6a 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -45,12 +45,6 @@ fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence, { struct fd_context *ctx = fd_context(pctx); - if (!ctx->batch) { - if (fence) - *fence = NULL; - return; - } - if (flags & PIPE_FLUSH_FENCE_FD) ctx->batch->needs_out_fence_fd = true; @@ -283,13 +277,7 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen, goto fail; pctx->const_uploader = pctx->stream_uploader; - /* TODO what about compute? Ideally it creates it's own independent - * batches per compute job (since it isn't using tiling, so no point - * in getting involved with the re-ordering madness).. - */ - if (!screen->reorder) { - ctx->batch = fd_bc_alloc_batch(&screen->batch_cache, ctx); - } + ctx->batch = fd_bc_alloc_batch(&screen->batch_cache, ctx); slab_create_child(&ctx->transfer_pool, &screen->transfer_pool); |