diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-23 21:56:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 12:07:01 -0400 |
commit | 293ad927682715d8f2bbe8350821b2b0d244f7eb (patch) | |
tree | 065537dff793027be3237d8427373750844c15b8 /drivers | |
parent | 07406de2b68f84d1ad4ed698852ccada1c21542a (diff) |
drm/radeon/kms/atom: fix shr/shl ops
commit 6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca upstream.
The whole attribute table is valid for
shr/shl ops.
Fixes fdo bug 26668
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 7f152f66f196..d75788feac6c 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
@@ -881,8 +881,6 @@ static void atom_op_shl(atom_exec_context *ctx, int *ptr, int arg) | |||
881 | uint8_t attr = U8((*ptr)++), shift; | 881 | uint8_t attr = U8((*ptr)++), shift; |
882 | uint32_t saved, dst; | 882 | uint32_t saved, dst; |
883 | int dptr = *ptr; | 883 | int dptr = *ptr; |
884 | attr &= 0x38; | ||
885 | attr |= atom_def_dst[attr >> 3] << 6; | ||
886 | SDEBUG(" dst: "); | 884 | SDEBUG(" dst: "); |
887 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); | 885 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); |
888 | shift = atom_get_src(ctx, attr, ptr); | 886 | shift = atom_get_src(ctx, attr, ptr); |
@@ -897,8 +895,6 @@ static void atom_op_shr(atom_exec_context *ctx, int *ptr, int arg) | |||
897 | uint8_t attr = U8((*ptr)++), shift; | 895 | uint8_t attr = U8((*ptr)++), shift; |
898 | uint32_t saved, dst; | 896 | uint32_t saved, dst; |
899 | int dptr = *ptr; | 897 | int dptr = *ptr; |
900 | attr &= 0x38; | ||
901 | attr |= atom_def_dst[attr >> 3] << 6; | ||
902 | SDEBUG(" dst: "); | 898 | SDEBUG(" dst: "); |
903 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); | 899 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); |
904 | shift = atom_get_src(ctx, attr, ptr); | 900 | shift = atom_get_src(ctx, attr, ptr); |