Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / radeon / atom.c

diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 05efb5b9f13e841d265e3219d33e279e781de22f..258fa5e7a2d9aa4b175807f73e3f55fa407986f6 100644 (file)
--- 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)
 static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg)
 {
        uint8_t attr = U8((*ptr)++);
-       uint32_t dst, src1, src2, saved;
+       uint32_t dst, mask, src, saved;
        int dptr = *ptr;
        SDEBUG("   dst: ");
        dst = atom_get_dst(ctx, arg, attr, ptr, &saved, 1);
-       SDEBUG("   src1: ");
-       src1 = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr);
-       SDEBUG("   src2: ");
-       src2 = atom_get_src(ctx, attr, ptr);
-       dst &= src1;
-       dst |= src2;
+       mask = atom_get_src_direct(ctx, ((attr >> 3) & 7), ptr);
+       SDEBUG("   mask: 0x%08x", mask);
+       SDEBUG("   src: ");
+       src = atom_get_src(ctx, attr, ptr);
+       dst &= mask;
+       dst |= src;
        SDEBUG("   dst: ");
        atom_put_dst(ctx, arg, attr, &dptr, dst, saved);
 }