From patchwork Sat Jul 23 18:02:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1002512 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6NI2Ox7027752 for ; Sat, 23 Jul 2011 18:02:44 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9DF639ED79 for ; Sat, 23 Jul 2011 11:02:23 -0700 (PDT) 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 A72059E754 for ; Sat, 23 Jul 2011 11:02:14 -0700 (PDT) Received: by vws8 with SMTP id 8so2659009vws.36 for ; Sat, 23 Jul 2011 11:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=tNUO5DWzS1At6Ex7bkRYKt7+gTnTPYGBpQ5LXb+mmP4=; b=JiPkYYf1mrlLHs4YBKHP1Pd5FnblMf4Gmrxa72ItzffCaCyGEVjcBrsX8P3Eu5fBX4 GG6P09O3qP7TPNeovufbVxdKbEs4esnxtZA/ViMdE0T8AdiQgQ1a7q8O5BUuJdqVLOTL P2dSZeGQxVIrfAnIiHLeC8L7P5Ho0lvxmdgTU= Received: by 10.52.177.133 with SMTP id cq5mr2848090vdc.225.1311444134067; Sat, 23 Jul 2011 11:02:14 -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 z9sm1335455vco.38.2011.07.23.11.02.12 (version=SSLv3 cipher=OTHER); Sat, 23 Jul 2011 11:02:13 -0700 (PDT) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix i2c map for rv250/280 Date: Sat, 23 Jul 2011 14:02:04 -0400 Message-Id: <1311444124-12209-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: Alex Deucher , 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 (demeter2.kernel.org [140.211.167.43]); Sat, 23 Jul 2011 18:02:44 +0000 (UTC) From: Alex Deucher Those chips have crt2_ddc bus. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=39672 Signed-off-by: Alex Deucher Cc: stable@kernel.org --- drivers/gpu/drm/radeon/radeon_combios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index e459467..a74217c 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -779,7 +779,8 @@ void radeon_combios_i2c_init(struct radeon_device *rdev) } } } - } else if (rdev->family >= CHIP_R200) { + } else if ((rdev->family == CHIP_R200) || + (rdev->family >= CHIP_R300)) { /* 0x68 */ i2c = combios_setup_i2c_bus(rdev, DDC_MONID, 0, 0); rdev->i2c_bus[3] = radeon_i2c_create(dev, &i2c, "MONID");