From patchwork Thu Apr 14 15:19:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 707251 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 p3EFKDml017845 for ; Thu, 14 Apr 2011 15:20:34 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA9789EB53 for ; Thu, 14 Apr 2011 08:20:12 -0700 (PDT) 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 C3B559E897 for ; Thu, 14 Apr 2011 08:20:01 -0700 (PDT) Received: by qwi2 with SMTP id 2so1147637qwi.36 for ; Thu, 14 Apr 2011 08:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=SJ66vA2Ol6TxZmLL7GSQhjQZ70aFNCE4E5jptOtkS4o=; b=Zaj7x+5pImDRiZgjLh5EPlNzQHEvyjYjj93rC5Qkh9ql5DHb7IOMmxgFS+InnpOJJp iMJMPB3TPikxhMrpMXjgplsaEvSEeEY/KLPEz2MDqePmpaXSGKwDtIpDPtptwkK3kKZl tSZPb24BJ2sWWlhwmK6Ym9SobmEezUhWNMkqw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=cZRlfaoWZNWRpgnxFG6MC6hw0ZZQPrwW2Y/ZhrrDB+20Tx4mhocx3eGGe7/lOUA/lF MSRmsSkc6NOeT+Dayo/7x2wOJsAw6nolNTh1LtI0C2Lh60epxOsCjuzecYQiXvu99c3n sZTqK5QmTfvK1D4cGWOIqHPtsR+JZigduaKmY= Received: by 10.224.216.196 with SMTP id hj4mr604505qab.380.1302794398074; Thu, 14 Apr 2011 08:19:58 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id m7sm1233825qcg.29.2011.04.14.08.19.57 (version=SSLv3 cipher=OTHER); Thu, 14 Apr 2011 08:19:57 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix bad shift in atom iio table parser Date: Thu, 14 Apr 2011 11:19:50 -0400 Message-Id: <1302794390-1434-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Apr 2011 15:20:34 +0000 (UTC) Noticed by Patrick Lowry. Signed-off-by: Alex Deucher Cc: stable@kernel.org --- drivers/gpu/drm/radeon/atom.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index d71d375..7bd7456 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -135,7 +135,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_INDEX: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((index >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + @@ -145,7 +145,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_DATA: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((data >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + @@ -155,7 +155,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, case ATOM_IIO_MOVE_ATTR: temp &= ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << - CU8(base + 2)); + CU8(base + 3)); temp |= ((ctx-> io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 -