| Date | Fri, 12 Mar 2010 16:13:23 -0800 | From | Greg KH <> | Subject | [patch 105/123] drm/radeon/kms/atom: fix shr/shl ops |
| |
2.6.33-stable review patch. If anyone has any objections, please let me know.
-----------------
From: Alex Deucher <alexdeucher@gmail.com>
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>
--- drivers/gpu/drm/radeon/atom.c | 4 ---- 1 file changed, 4 deletions(-)
--- 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_contex 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); @@ -897,8 +895,6 @@ static void atom_op_shr(atom_exec_contex 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);
|