diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-23 21:56:12 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-25 13:32:06 +1000 |
| commit | 6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca (patch) | |
| tree | 1c10a2db2435548c19c2a7990399d45b5c1ba186 /drivers/gpu/drm/radeon/atom.c | |
| parent | 172e91f535dc3607a7dba1d249ab9e918444548a (diff) | |
| download | blackbird-obmc-linux-6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca.tar.gz blackbird-obmc-linux-6a8a2d702b33c6ed5c789f21b4e89fdf221f01ca.zip | |
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: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/atom.c')
| -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 e3b44562d265..614295a11dfb 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -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); |
