drm/radeon/kms/atom: atom parser fixes
Only reset the reg block on the initial execute table call; nested calls require the reg block not be reset on each call. Also reset the fb window and io mode. This matches the upstream parser behavior. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
4eaeca3351
commit
947bfc8304
|
@ -1122,8 +1122,6 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3
|
||||||
|
|
||||||
SDEBUG(">> execute %04X (len %d, WS %d, PS %d)\n", base, len, ws, ps);
|
SDEBUG(">> execute %04X (len %d, WS %d, PS %d)\n", base, len, ws, ps);
|
||||||
|
|
||||||
/* reset reg block */
|
|
||||||
ctx->reg_block = 0;
|
|
||||||
ectx.ctx = ctx;
|
ectx.ctx = ctx;
|
||||||
ectx.ps_shift = ps / 4;
|
ectx.ps_shift = ps / 4;
|
||||||
ectx.start = base;
|
ectx.start = base;
|
||||||
|
@ -1160,6 +1158,12 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3
|
||||||
void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params)
|
void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params)
|
||||||
{
|
{
|
||||||
mutex_lock(&ctx->mutex);
|
mutex_lock(&ctx->mutex);
|
||||||
|
/* reset reg block */
|
||||||
|
ctx->reg_block = 0;
|
||||||
|
/* reset fb window */
|
||||||
|
ctx->fb_base = 0;
|
||||||
|
/* reset io mode */
|
||||||
|
ctx->io_mode = ATOM_IO_MM;
|
||||||
atom_execute_table_locked(ctx, index, params);
|
atom_execute_table_locked(ctx, index, params);
|
||||||
mutex_unlock(&ctx->mutex);
|
mutex_unlock(&ctx->mutex);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue