From patchwork Sun Nov 21 15:58:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 345791 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 oALFwqXU002960 for ; Sun, 21 Nov 2010 15:59:19 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 196A0A09A4 for ; Sun, 21 Nov 2010 07:58:51 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 879EDA099A for ; Sun, 21 Nov 2010 07:58:19 -0800 (PST) Received: by vws1 with SMTP id 1so3076855vws.36 for ; Sun, 21 Nov 2010 07:58:18 -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=1dZkYuGV1/M7vMwVDqKsDCvlR61UrTI9pE8SYb5dD7k=; b=wAkZmyxMDNxVeNdiAke2rEJHmyG/zL7U3+aPpud6WaIFn6e8QHSYXWNGdP3cXSm4+5 8uwQe+V95zs5nFAHQBtTRj7SWUxIygIgi0KKYpaJ4Gj8NvtL2AyKwce3t7wxBzVhLYIz xh8m98/ToaTEYjwZTdEXHiohNgPXN4nhDdE4U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=q7JlLwCWZH5nPDwU2pHOwKCJXTH7qyA1RmLRxeVjk1nXn2fbcUFCjPxNIM/UZJEvjQ 4N5VwY2p6hOECi5fZG17noA0JLeXxPx6bL7II4HZ/Of+ki6VbJH7lx8+2joPV+cwlmmF 2j6icRMdWWhnwbX96aPUJZWEMltX1VHSH69TM= Received: by 10.220.194.6 with SMTP id dw6mr1085827vcb.276.1290355096737; Sun, 21 Nov 2010 07:58:16 -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 u6sm1362545vby.7.2010.11.21.07.58.14 (version=SSLv3 cipher=RC4-MD5); Sun, 21 Nov 2010 07:58:15 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix regression in rs4xx i2c setup Date: Sun, 21 Nov 2010 10:58:05 -0500 Message-Id: <1290355085-15902-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.3 (demeter1.kernel.org [140.211.167.41]); Sun, 21 Nov 2010 15:59:19 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 3bddea5..137b807 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -729,7 +729,7 @@ void radeon_combios_i2c_init(struct radeon_device *rdev) clk = RBIOS8(offset + 3 + (i * 5) + 3); data = RBIOS8(offset + 3 + (i * 5) + 4); i2c = combios_setup_i2c_bus(rdev, DDC_MONID, - clk, data); + (1 << clk), (1 << data)); rdev->i2c_bus[4] = radeon_i2c_create(dev, &i2c, "GPIOPAD_MASK"); break; }