diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
| commit | 83eb95b852902f952ba594447a796ad8146b9462 (patch) | |
| tree | 33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /drivers/gpu/drm/radeon/atom.c | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/radeon/atom.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 05efb5b9f13e..258fa5e7a2d9 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
| @@ -734,16 +734,16 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) | |||
| 734 | static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) | 734 | static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) |
| 735 | { | 735 | { |
| 736 | uint8_t attr = U8((*ptr)++); | 736 | uint8_t attr = U8((*ptr)++); |
| 737 | uint32_t dst, src1, src2, saved; | 737 | uint32_t dst, mask, src, saved; |
| 738 | int dptr = *ptr; | 738 | int dptr = *ptr; |
| 739 | SDEBUG(" dst: "); | 739 | SDEBUG(" dst: "); |
| 740 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); | 740 | dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1); |
| 741 | SDEBUG(" src1: "); | 741 | mask = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr); |
| 742 | src1 = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr); | 742 | SDEBUG(" mask: 0x%08x", mask); |
| 743 | SDEBUG(" src2: "); | 743 | SDEBUG(" src: "); |
| 744 | src2 = atom_get_src(ctx, attr, ptr); | 744 | src = atom_get_src(ctx, attr, ptr); |
| 745 | dst &= src1; | 745 | dst &= mask; |
| 746 | dst |= src2; | 746 | dst |= src; |
| 747 | SDEBUG(" dst: "); | 747 | SDEBUG(" dst: "); |
| 748 | atom_put_dst(ctx, arg, attr, &dptr, dst, saved); | 748 | atom_put_dst(ctx, arg, attr, &dptr, dst, saved); |
| 749 | } | 749 | } |