alihanozturk
104 lines
3.9 KiB
Diff
104 lines
3.9 KiB
Diff
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
|
|
index 10c9f56..c5761a3 100644
|
|
--- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c
|
|
+++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c
|
|
@@ -127,6 +127,8 @@ nv30_render_draw_elements(struct vbuf_render *render,
|
|
struct nouveau_pushbuf *push = nv30->screen->base.pushbuf;
|
|
unsigned i;
|
|
|
|
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
|
|
+
|
|
BEGIN_NV04(push, NV30_3D(VTXBUF(0)), r->vertex_info.num_attribs);
|
|
for (i = 0; i < r->vertex_info.num_attribs; i++) {
|
|
PUSH_RESRC(push, NV30_3D(VTXBUF(i)), BUFCTX_VTXTMP,
|
|
@@ -134,8 +136,10 @@ nv30_render_draw_elements(struct vbuf_render *render,
|
|
NOUVEAU_BO_LOW | NOUVEAU_BO_RD, 0, NV30_3D_VTXBUF_DMA1);
|
|
}
|
|
|
|
- if (!nv30_state_validate(nv30, ~0, false))
|
|
+ if (!nv30_state_validate(nv30, ~0, false)) {
|
|
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
|
|
return;
|
|
+ }
|
|
|
|
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
|
|
PUSH_DATA (push, r->prim);
|
|
@@ -160,6 +164,8 @@ nv30_render_draw_elements(struct vbuf_render *render,
|
|
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
|
|
PUSH_DATA (push, NV30_3D_VERTEX_BEGIN_END_STOP);
|
|
PUSH_RESET(push, BUFCTX_VTXTMP);
|
|
+
|
|
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
|
|
}
|
|
|
|
static void
|
|
@@ -172,6 +178,8 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
|
|
unsigned ps = fn + (pn ? 1 : 0);
|
|
unsigned i;
|
|
|
|
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
|
|
+
|
|
BEGIN_NV04(push, NV30_3D(VTXBUF(0)), r->vertex_info.num_attribs);
|
|
for (i = 0; i < r->vertex_info.num_attribs; i++) {
|
|
PUSH_RESRC(push, NV30_3D(VTXBUF(i)), BUFCTX_VTXTMP,
|
|
@@ -179,8 +187,10 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
|
|
NOUVEAU_BO_LOW | NOUVEAU_BO_RD, 0, NV30_3D_VTXBUF_DMA1);
|
|
}
|
|
|
|
- if (!nv30_state_validate(nv30, ~0, false))
|
|
+ if (!nv30_state_validate(nv30, ~0, false)) {
|
|
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
|
|
return;
|
|
+ }
|
|
|
|
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
|
|
PUSH_DATA (push, r->prim);
|
|
@@ -197,6 +207,8 @@ nv30_render_draw_arrays(struct vbuf_render *render, unsigned start, uint nr)
|
|
BEGIN_NV04(push, NV30_3D(VERTEX_BEGIN_END), 1);
|
|
PUSH_DATA (push, NV30_3D_VERTEX_BEGIN_END_STOP);
|
|
PUSH_RESET(push, BUFCTX_VTXTMP);
|
|
+
|
|
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
|
|
}
|
|
|
|
static void
|
|
@@ -386,6 +398,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
|
|
|
|
nv30_render_validate(nv30);
|
|
|
|
+ pipe_mutex_unlock(nv30->screen->base.push_mutex);
|
|
+
|
|
if (nv30->draw_dirty & NV30_NEW_VIEWPORT)
|
|
draw_set_viewport_states(draw, 0, 1, &nv30->viewport);
|
|
if (nv30->draw_dirty & NV30_NEW_RASTERIZER)
|
|
@@ -451,6 +465,8 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
|
|
if (transfer[i])
|
|
pipe_buffer_unmap(pipe, transfer[i]);
|
|
|
|
+ pipe_mutex_lock(nv30->screen->base.push_mutex);
|
|
+
|
|
nv30->draw_dirty = 0;
|
|
nv30_state_release(nv30);
|
|
}
|
|
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c
|
|
index 6de61bc..fd21f99 100644
|
|
--- a/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c
|
|
+++ b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c
|
|
@@ -38,6 +38,8 @@ nv30_fragprog_upload(struct nv30_context *nv30)
|
|
struct nv30_fragprog *fp = nv30->fragprog.program;
|
|
struct pipe_context *pipe = &nv30->base.pipe;
|
|
|
|
+ pipe_mutex_unlock(nv->screen->push_mutex);
|
|
+
|
|
if (unlikely(!fp->buffer))
|
|
fp->buffer = pipe_buffer_create(pipe->screen, 0, 0, fp->insn_len * 4);
|
|
|
|
@@ -60,6 +62,8 @@ nv30_fragprog_upload(struct nv30_context *nv30)
|
|
|
|
if (nv04_resource(fp->buffer)->domain != NOUVEAU_BO_VRAM)
|
|
nouveau_buffer_migrate(nv, nv04_resource(fp->buffer), NOUVEAU_BO_VRAM);
|
|
+
|
|
+ pipe_mutex_lock(nv->screen->push_mutex);
|
|
}
|
|
|
|
void
|