Skip to content

Commit

Permalink
nouveau: relax fence emit space assert
Browse files Browse the repository at this point in the history
We also have the "reserved for kick" space available. Some of my earlier
changes can probably be removed, but this is a quick fix for some of the
rarer fallout.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: <mesa-stable@lists.freedesktop.org>
  • Loading branch information
imirkin committed Nov 5, 2015
1 parent 6d3a24b commit bb73fc4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/gallium/drivers/nouveau/nv30/nv30_screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ nv30_screen_fence_emit(struct pipe_screen *pscreen, uint32_t *sequence)

*sequence = ++screen->base.fence.sequence;

assert(PUSH_AVAIL(push) >= 3);
assert(PUSH_AVAIL(push) + push->rsvd_kick >= 3);
PUSH_DATA (push, NV30_3D_FENCE_OFFSET |
(2 /* size */ << 18) | (7 /* subchan */ << 13));
PUSH_DATA (push, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/gallium/drivers/nouveau/nv50/nv50_screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ nv50_screen_fence_emit(struct pipe_screen *pscreen, u32 *sequence)
/* we need to do it after possible flush in MARK_RING */
*sequence = ++screen->base.fence.sequence;

assert(PUSH_AVAIL(push) >= 5);
assert(PUSH_AVAIL(push) + push->rsvd_kick >= 5);
PUSH_DATA (push, NV50_FIFO_PKHDR(NV50_3D(QUERY_ADDRESS_HIGH), 4));
PUSH_DATAh(push, screen->fence.bo->offset);
PUSH_DATA (push, screen->fence.bo->offset);
Expand Down
2 changes: 1 addition & 1 deletion src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ nvc0_screen_fence_emit(struct pipe_screen *pscreen, u32 *sequence)
/* we need to do it after possible flush in MARK_RING */
*sequence = ++screen->base.fence.sequence;

assert(PUSH_AVAIL(push) >= 5);
assert(PUSH_AVAIL(push) + push->rsvd_kick >= 5);
PUSH_DATA (push, NVC0_FIFO_PKHDR_SQ(NVC0_3D(QUERY_ADDRESS_HIGH), 4));
PUSH_DATAh(push, screen->fence.bo->offset);
PUSH_DATA (push, screen->fence.bo->offset);
Expand Down

0 comments on commit bb73fc4

Please sign in to comment.