diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-01 15:40:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-01 15:40:12 +1000 |
| commit | 79fa9eb7396238233c327668185d28bb47fb0796 (patch) | |
| tree | df91899c274005adb02a7a8ca5d9e5609bc2d05b /drivers/gpu/drm/radeon/atom.c | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| parent | 290e55056ec3d25c72088628245d8cae037b30db (diff) | |
| download | linux-79fa9eb7396238233c327668185d28bb47fb0796.tar.gz linux-79fa9eb7396238233c327668185d28bb47fb0796.tar.bz2 linux-79fa9eb7396238233c327668185d28bb47fb0796.zip | |
Merge remote branch 'korg/drm-core-next' into drm-next-stage
* korg/drm-core-next:
drm/ttm: handle OOM in ttm_tt_swapout
drm/radeon/kms/atom: fix shr/shl ops
drm/kms: fix spelling of "CLOCK"
drm/kms: fix fb_changed = true else statement
drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
drm: switch all GEM/KMS ioctls to unlocked ioctl status.
Use drm_gem_object_[handle_]unreference_unlocked where possible
drm: introduce drm_gem_object_[handle_]unreference_unlocked
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 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) 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_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); |