From patchwork Tue Jun 14 15:27:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 879302 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 p5EFRuMt006035 for ; Tue, 14 Jun 2011 15:28:16 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B06BD9E7B5 for ; Tue, 14 Jun 2011 08:27:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id C89BC9E7B5 for ; Tue, 14 Jun 2011 08:27:45 -0700 (PDT) Received: by vxd2 with SMTP id 2so5805463vxd.36 for ; Tue, 14 Jun 2011 08:27:45 -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 :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=Q/yOjojucZFluDACOwLGS7i56enZObiSXExR20FpxiE=; b=BW0aFske8wO6MApwmjfdss1LkX+g/FX2J1yarokWWNZrq9DRT6Ux2fJpXcYZE/SEWI Nisc7t3D3NX41AQiQPzZGizIMoJopchKvHJbYCru86SXeigWPB/4peVwQ6uw73VETiRG /1EmYz04GAHdDqVjqQJsHtZoP+RDBp2NV+jcc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=WpMXytJSVMz1PJgJ37GEbvGI29LO19y+9d1PDPlW9MvBmvtyRp46wpmauEe225w8RY X6DhJ5WKEXdoY8H4cbXwKgO6bLJkmpsa/gGM8RWNZzsxorFlrbdm5/fy8Jv+o6dnHt49 3LVOTcBjJC4dAdWdydp17NZuFkc7qlFYY3SKc= Received: by 10.52.177.196 with SMTP id cs4mr1621547vdc.279.1308065265101; Tue, 14 Jun 2011 08:27:45 -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 j4sm2267963vdu.19.2011.06.14.08.27.44 (version=SSLv3 cipher=OTHER); Tue, 14 Jun 2011 08:27:44 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: be more pedantic about the g5 quirk (v2) Date: Tue, 14 Jun 2011 11:27:38 -0400 Message-Id: <1308065258-16403-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1308065117.6619.249.camel@thor.local> References: <1308065117.6619.249.camel@thor.local> MIME-Version: 1.0 Cc: =?UTF-8?q?Michel=20D=C3=A4nzer?= , Joachim Henke 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: , 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]); Tue, 14 Jun 2011 15:28:16 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter2.kernel.org id p5EFRuMt006035 I don't think Apple offered any other cards for this mac, so I doubt this will be an issue, but just to be on the safe side, check the pci ids as well. v2: fix spelling in commit message Reviewed-by: Michel Dänzer Signed-off-by: Alex Deucher Cc: Joachim Henke Cc: Michel Dänzer --- drivers/gpu/drm/radeon/radeon_combios.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 797c8bc..e459467 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -1553,9 +1553,12 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) (rdev->pdev->subsystem_device == 0x4a48)) { /* Mac X800 */ rdev->mode_info.connector_table = CT_MAC_X800; - } else if (of_machine_is_compatible("PowerMac7,2") || - of_machine_is_compatible("PowerMac7,3")) { - /* Mac G5 9600 */ + } else if ((of_machine_is_compatible("PowerMac7,2") || + of_machine_is_compatible("PowerMac7,3")) && + (rdev->pdev->device == 0x4150) && + (rdev->pdev->subsystem_vendor == 0x1002) && + (rdev->pdev->subsystem_device == 0x4150)) { + /* Mac G5 tower 9600 */ rdev->mode_info.connector_table = CT_MAC_G5_9600; } else #endif /* CONFIG_PPC_PMAC */