Commit 9f53e793 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/atom: fix some parser bugs 



- add support for inline src params
- fix shift_left/shift_right and shl/shr ops
  shift_* ops use inline src params, shl/r use full params
- fix mask op (uses inline params)

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 07bec2df

drivers/gpu/drm/radeon/atom.c

+74 −16
Original line number Diff line number Diff line
@@ -385,6 +385,32 @@ static uint32_t atom_get_src(atom_exec_context *ctx, uint8_t attr, int *ptr) 
	return atom_get_src_int(ctx, attr, ptr, NULL, 1);

}



static uint32_t atom_get_src_direct(atom_exec_context *ctx, uint8_t align, int *ptr)

{

	uint32_t val = 0xCDCDCDCD;



	switch (align) {

	case ATOM_SRC_DWORD:

		val = U32(*ptr);

		(*ptr) += 4;

		break;

	case ATOM_SRC_WORD0:

	case ATOM_SRC_WORD8:

	case ATOM_SRC_WORD16:

		val = U16(*ptr);

		(*ptr) += 2;

		break;

	case ATOM_SRC_BYTE0:

	case ATOM_SRC_BYTE8:

	case ATOM_SRC_BYTE16:

	case ATOM_SRC_BYTE24:

		val = U8(*ptr);

		(*ptr)++;

		break;

	}

	return val;

}



static uint32_t atom_get_dst(atom_exec_context *ctx, int arg, uint8_t attr,

			     int *ptr, uint32_t *saved, int print)

{
@@ -677,9 +703,9 @@ static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) 
	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	SDEBUG("   src1: ");

	src1 = atom_get_src(ctx, attr, ptr);

	src1 = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr);

	SDEBUG("   src2: ");

	src2 = atom_get_src(ctx, attr, ptr);

	src2 = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr);

	dst &= src1;

	dst |= src2;

	SDEBUG("   dst: ");
@@ -809,6 +835,38 @@ static void atom_op_setregblock(atom_exec_context *ctx, int *ptr, int arg) 
	SDEBUG("   base: 0x%04X\n", ctx->ctx->reg_block);

}



static void atom_op_shift_left(atom_exec_context *ctx, int *ptr, int arg)

{

	uint8_t attr = U8((*ptr)++), shift;

	uint32_t saved, dst;

	int dptr = *ptr;

	attr &= 0x38;

	attr |= atom_def_dst[attr >> 3] << 6;

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	shift = atom_get_src_direct(ctx, ATOM_SRC_BYTE0, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst <<= shift;

	SDEBUG("   dst: ");

	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);

}



static void atom_op_shift_right(atom_exec_context *ctx, int *ptr, int arg)

{

	uint8_t attr = U8((*ptr)++), shift;

	uint32_t saved, dst;

	int dptr = *ptr;

	attr &= 0x38;

	attr |= atom_def_dst[attr >> 3] << 6;

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	shift = atom_get_src_direct(ctx, ATOM_SRC_BYTE0, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst >>= shift;

	SDEBUG("   dst: ");

	atom_put_dst(ctx, arg, attr, &dptr, dst, saved);

}



static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg)

{

	uint8_t attr = U8((*ptr)++), shift;
@@ -818,7 +876,7 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg) 
	attr |= atom_def_dst[attr >> 3] << 6;

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	shift = U8((*ptr)++);

	shift = atom_get_src(ctx, attr, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst <<= shift;

	SDEBUG("   dst: ");
@@ -834,7 +892,7 @@ static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg) 
	attr |= atom_def_dst[attr >> 3] << 6;

	SDEBUG("   dst: ");

	dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);

	shift = U8((*ptr)++);

	shift = atom_get_src(ctx, attr, ptr);

	SDEBUG("   shift: %d\n", shift);

	dst >>= shift;

	SDEBUG("   dst: ");
@@ -937,18 +995,18 @@ static struct { 
	atom_op_or, ATOM_ARG_FB}, {

	atom_op_or, ATOM_ARG_PLL}, {

	atom_op_or, ATOM_ARG_MC}, {

	atom_op_shl, ATOM_ARG_REG}, {

	atom_op_shl, ATOM_ARG_PS}, {

	atom_op_shl, ATOM_ARG_WS}, {

	atom_op_shl, ATOM_ARG_FB}, {

	atom_op_shl, ATOM_ARG_PLL}, {

	atom_op_shl, ATOM_ARG_MC}, {

	atom_op_shr, ATOM_ARG_REG}, {

	atom_op_shr, ATOM_ARG_PS}, {

	atom_op_shr, ATOM_ARG_WS}, {

	atom_op_shr, ATOM_ARG_FB}, {

	atom_op_shr, ATOM_ARG_PLL}, {

	atom_op_shr, ATOM_ARG_MC}, {

	atom_op_shift_left, ATOM_ARG_REG}, {

	atom_op_shift_left, ATOM_ARG_PS}, {

	atom_op_shift_left, ATOM_ARG_WS}, {

	atom_op_shift_left, ATOM_ARG_FB}, {

	atom_op_shift_left, ATOM_ARG_PLL}, {

	atom_op_shift_left, ATOM_ARG_MC}, {

	atom_op_shift_right, ATOM_ARG_REG}, {

	atom_op_shift_right, ATOM_ARG_PS}, {

	atom_op_shift_right, ATOM_ARG_WS}, {

	atom_op_shift_right, ATOM_ARG_FB}, {

	atom_op_shift_right, ATOM_ARG_PLL}, {

	atom_op_shift_right, ATOM_ARG_MC}, {

	atom_op_mul, ATOM_ARG_REG}, {

	atom_op_mul, ATOM_ARG_PS}, {

	atom_op_mul, ATOM_ARG_WS}, {