From patchwork Mon Jun 6 16:53:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 852602 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 p56GrwDO030546 for ; Mon, 6 Jun 2011 16:54:19 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 35FD59E9D2 for ; Mon, 6 Jun 2011 09:53:58 -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 6482E9E7CA for ; Mon, 6 Jun 2011 09:53:49 -0700 (PDT) Received: by qwi2 with SMTP id 2so2268304qwi.36 for ; Mon, 06 Jun 2011 09:53:48 -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=J8D3E57RDA1KcdbyyDCgAFHRPlVHksdslHzCMFglMx0=; b=HQhRB6U2k+rerwRb2UxtPzUD327fXZucQn2/oY0fUQJfC/2uIHRwoFlghFJZdY7MAq pCCfTVF+HIe2zsGa5NrU+XeahgzDti+AljTyFPn4rEM2rdAJwmBu7IoUAjVx5Qh05OPG KC3d4gNkojGGvOpO8p60PxBue8HaTZ8IbNbpQ= 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=AF9fJzHc8XF4U4axYb3zCW8+DP21breuTot61UU81Pz4iURlrnj04gtepQI31HB38f rP+cnoOWBr7P989icJrA2y3Onv+x2Kmgnc58Rdqqqx99a8RcxthSBLAODRkGtO8SR4WL nzZ5tk+xsX35gGm6kgrKe4r8ugQm/6Gc9zYkk= Received: by 10.229.197.13 with SMTP id ei13mr3706961qcb.50.1307379228627; Mon, 06 Jun 2011 09:53:48 -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 t28sm2966279qcs.29.2011.06.06.09.53.47 (version=SSLv3 cipher=OTHER); Mon, 06 Jun 2011 09:53:47 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix mac g5 quirk Date: Mon, 6 Jun 2011 12:53:30 -0400 Message-Id: <1307379210-9213-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <4DD7F0F3.5060701@users.sourceforge.net> References: <4DD7F0F3.5060701@users.sourceforge.net> 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 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Jun 2011 16:54:19 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter1.kernel.org id p56GrwDO030546 Apple uses the same subsystem pci ids for lots of hardware much of which is wired up differently. In this case, the G5 imac and the G5 tower. Only apply the quirk configuration to G5 towers. Reported-by: Joachim Henke Signed-off-by: Alex Deucher Cc: Joachim Henke Cc: Michel Dänzer --- drivers/gpu/drm/radeon/radeon_combios.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 5b991f7..19b10cf 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -1548,9 +1548,8 @@ 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 ((rdev->pdev->device == 0x4150) && - (rdev->pdev->subsystem_vendor == 0x1002) && - (rdev->pdev->subsystem_device == 0x4150)) { + } else if (of_machine_is_compatible("PowerMac7,2") || + of_machine_is_compatible("PowerMac7,3")) { /* Mac G5 9600 */ rdev->mode_info.connector_table = CT_MAC_G5_9600; } else