From patchwork Mon Dec 20 16:21:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 421531 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBKGM0Xh022794 for ; Mon, 20 Dec 2010 16:22:21 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB04D9EDD9 for ; Mon, 20 Dec 2010 08:21:59 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 199ED9E755 for ; Mon, 20 Dec 2010 08:21:50 -0800 (PST) Received: by qwj9 with SMTP id 9so3059908qwj.36 for ; Mon, 20 Dec 2010 08:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ZYyAUrAnKzmeLuTDgEjVfhbZ0OtuXEV7vCIWk3hRHNY=; b=LpP6S4Ly3BxzZJUFEvN9YNE5bHUpvjf4Q8CcOGgtosbd3EsVoH4AZqSJ6/wy6KSa/7 EiZ/rmVEuqeXc4FMbhwIwWAZecVkgA0Ex1aamoHbnf5vK69bHZUUsdc19QwZc+f11/Li T+N+nLbHWdUCt9xfv+hFGKxKkGrq/wBuSnLbU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=QvXrkEDDc5nuag01xj3bY7PISMaxR+mXg1tuOBmHVnufJ3AxhSJAGOkJ35qYYivM8x LYNobUWkP/MP/k3nmPcYTOF8DlKPj8GqsZb+znYWCjvjS88uN5Vzk+wBVHgczpuDzys7 AEJrScnHwAO3qmVlpz+mGk9zIk/dMwRIs3CTA= Received: by 10.229.213.211 with SMTP id gx19mr3922546qcb.172.1292862110452; Mon, 20 Dec 2010 08:21:50 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id y17sm2269238qci.45.2010.12.20.08.21.48 (version=SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 08:21:49 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms/atom: clean up op_mask handler Date: Mon, 20 Dec 2010 11:21:43 -0500 Message-Id: <1292862103-19824-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Dec 2010 16:22:22 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 8e421f6..9b0773b 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -733,16 +733,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); }