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

New, less expensive workaround for state-change lockups.

Browse source
This commit is contained in:
Felix Kuehling 2004-01-04 22:08:31 +00:00
parent 9741dd6cf4
commit 22d1acf2ee
2 changed files with 53 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/radeon/radeon_context.h
View file

@ -185,6 +185,7 @@ struct radeon_state_atom {
GLuint is_tcl; GLuint is_tcl;
int *cmd; /* one or more cmd's */ int *cmd; /* one or more cmd's */
int *lastcmd; /* one or more cmd's */ int *lastcmd; /* one or more cmd's */
GLboolean dirty; /* dirty-mark in emit_state_list */
GLboolean (*check)( GLcontext * ); /* is this state active? */ GLboolean (*check)( GLcontext * ); /* is this state active? */
}; };

72
src/mesa/drivers/dri/radeon/radeon_ioctl.c
View file

@ -80,30 +80,21 @@ static void radeon_emit_state_list( radeonContextPtr rmesa,
{ {
struct radeon_state_atom *state, *tmp; struct radeon_state_atom *state, *tmp;
char *dest; char *dest;
int i, size, texunits;
/* From Felix Kuhling: similar to some other lockups, glaxium will /* It appears that some permutations of state atoms lock up the
* lock with what we believe to be a normal command stream, but * chip. Therefore we make sure that state atoms are emitted in a
* sprinkling some magic waits arounds allows it to run * fixed order. First mark all dirty state atoms and then go
* uninterrupted. This has a slight effect on q3 framerates, but * through all state atoms in a well defined order and emit only
* it might now be possible to remove the zbs hack, below. * the marked ones.
* * FIXME: This requires knowledge of which state atoms exist.
* Felix reports that this can be narrowed down to just * FIXME: Is the zbs hack below still needed?
* tcl,tex0,tex1 state, but that's pretty much every statechange,
* so let's just put the wait in always (unless Felix wants to
* narrow it down further...)
*/ */
if (1) { size = 0;
drmRadeonCmdHeader *cmd;
cmd = (drmRadeonCmdHeader *)radeonAllocCmdBuf( rmesa, sizeof(*cmd),
__FUNCTION__ );
cmd->wait.cmd_type = RADEON_CMD_WAIT;
cmd->wait.flags = RADEON_WAIT_3D;
}
foreach_s( state, tmp, list ) { foreach_s( state, tmp, list ) {
if (state->check( rmesa->glCtx )) { if (state->check( rmesa->glCtx )) {
dest = radeonAllocCmdBuf( rmesa, state->cmd_size * 4, __FUNCTION__); size += state->cmd_size;
memcpy( dest, state->cmd, state->cmd_size * 4); state->dirty = GL_TRUE;
move_to_head( &(rmesa->hw.clean), state ); move_to_head( &(rmesa->hw.clean), state );
if (RADEON_DEBUG & DEBUG_STATE) if (RADEON_DEBUG & DEBUG_STATE)
print_state_atom( state ); print_state_atom( state );
@ -111,6 +102,47 @@ static void radeon_emit_state_list( radeonContextPtr rmesa,
else if (RADEON_DEBUG & DEBUG_STATE) else if (RADEON_DEBUG & DEBUG_STATE)
fprintf(stderr, "skip state %s\n", state->name); fprintf(stderr, "skip state %s\n", state->name);
} }
/* short cut */
if (!size)
return;
dest = radeonAllocCmdBuf( rmesa, size * 4, __FUNCTION__);
texunits = rmesa->glCtx->Const.MaxTextureUnits;
#define EMIT_ATOM(ATOM) \
do { \
if (rmesa->hw.ATOM.dirty) { \
rmesa->hw.ATOM.dirty = GL_FALSE; \
memcpy( dest, rmesa->hw.ATOM.cmd, rmesa->hw.ATOM.cmd_size * 4); \
dest += rmesa->hw.ATOM.cmd_size * 4; \
} \
} while (0)
EMIT_ATOM (ctx);
EMIT_ATOM (set);
EMIT_ATOM (lin);
EMIT_ATOM (msk);
EMIT_ATOM (vpt);
EMIT_ATOM (tcl);
EMIT_ATOM (msc);
for (i = 0; i < texunits; ++i) {
EMIT_ATOM (tex[i]);
EMIT_ATOM (txr[i]);
}
EMIT_ATOM (zbs);
EMIT_ATOM (mtl);
for (i = 0; i < 3 + texunits; ++i)
EMIT_ATOM (mat[i]);
for (i = 0; i < 8; ++i)
EMIT_ATOM (lit[i]);
for (i = 0; i < 6; ++i)
EMIT_ATOM (ucp[i]);
EMIT_ATOM (eye);
EMIT_ATOM (grd);
EMIT_ATOM (fog);
EMIT_ATOM (glt);
#undef EMIT_ATOM
} }