From patchwork Tue Jan 18 18:26:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 486741 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 p0IIQXc1029533 for ; Tue, 18 Jan 2011 18:26:54 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 363DE9E926 for ; Tue, 18 Jan 2011 10:26:33 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com [209.85.161.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 1CED09E815 for ; Tue, 18 Jan 2011 10:26:20 -0800 (PST) Received: by fxm19 with SMTP id 19so7486563fxm.36 for ; Tue, 18 Jan 2011 10:26:20 -0800 (PST) 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=zX70TYnHGbiMGcDo21BmQCK5igG4dBWEQ7JlS7UwBWA=; b=AGeUOEZYx2TGAlfB0DmNc6+hK+fWEeicW9tla60bKZ28ehAy97ONldpEHpTiUuupjU rWothxR5vyGhQ1nrYRG9Qg0bHgvbWoutJLANSmSCpvxg9AIYgv/v542IVgEWe5uDHxJ6 nSDN5DH34lrYtkAD7FzewstS10sc9InPpbOa4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=mQdUtnvVUL1QntVRgTwfaIxRi23x4fn8WtJwgDx4XI1hm5dXev/dYQdZ3krzjr19kH oAinq0yancym3gduXzAraxPhjB3v/q/j/sAhQAe7ry1cI29pCSfk77bWv2kIo1jtV8Lp Kh1pEhTlJT662zmallMlAn8vnnx9cTztZmrts= Received: by 10.223.96.138 with SMTP id h10mr6606210fan.120.1295375180145; Tue, 18 Jan 2011 10:26:20 -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 k6sm2235074faa.30.2011.01.18.10.26.18 (version=SSLv3 cipher=RC4-MD5); Tue, 18 Jan 2011 10:26:19 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: make the mac rv630 quirk generic Date: Tue, 18 Jan 2011 13:26:11 -0500 Message-Id: <1295375171-13828-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]); Tue, 18 Jan 2011 18:26:54 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 1573202..5277790 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -387,15 +387,11 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, *line_mux = 0x90; } - /* mac rv630 */ - if ((dev->pdev->device == 0x9588) && - (dev->pdev->subsystem_vendor == 0x106b) && - (dev->pdev->subsystem_device == 0x00a6)) { - if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) && - (*connector_type == DRM_MODE_CONNECTOR_DVII)) { - *connector_type = DRM_MODE_CONNECTOR_9PinDIN; - *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1; - } + /* mac rv630, rv730, others */ + if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) && + (*connector_type == DRM_MODE_CONNECTOR_DVII)) { + *connector_type = DRM_MODE_CONNECTOR_9PinDIN; + *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1; } /* ASUS HD 3600 XT board lists the DVI port as HDMI */