Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a8a2d70 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/atom: fix shr/shl ops 



The whole attribute table is valid for
shr/shl ops.

Fixes fdo bug 26668

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 172e91f5

drivers/gpu/drm/radeon/atom.c

+0 −4
Original line number Diff line number Diff line
@@ -878,8 +878,6 @@ static void atom_op_shl(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(ctx, attr, ptr);
@@ -894,8 +892,6 @@ static void atom_op_shr(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(ctx, attr, ptr);