From patchwork Wed May 4 15:41:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 754202 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 p44Fg43d000874 for ; Wed, 4 May 2011 15:42:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D0DC9EB21 for ; Wed, 4 May 2011 08:42:03 -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 2E85D9E930 for ; Wed, 4 May 2011 08:41:54 -0700 (PDT) Received: by vxd2 with SMTP id 2so1626843vxd.36 for ; Wed, 04 May 2011 08:41:54 -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; bh=oB2A/60200dpn/uEIqt8PkZtXy3Lbk5U5C8Imahq100=; b=GjP9OA3xuRit1Muvj+j5AD/tACpHWDZ/hHx20kR/ngP8AYgRTV4cxlZ2aXRUOO+ULk Bqz9pO0hqo6nyQdMfvF2AW00d7iA6lU+n9ugPq5WvWvwMmCMyn0ZI6QOd7j6CJDAWT+y WPEux6yRUlmcf7h8uMTl38LIibqE8H1QlIxrg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=BUZ32jnFO8MpgPXOb+ocTD/i+KQBIOJbQryOvfSXIdEDCjVWQy+GMFZGadt/BLOO+h e9pzuttsxgqnROhBWv35MMQasGqNkBXBFyFqaJ+RgYQHFePO59mADYPAQeYnsTDFqz23 HnfaVU/zfkS80YR+ixNZ25y9T1YgGgPUc1RBQ= Received: by 10.52.113.168 with SMTP id iz8mr1563121vdb.35.1304523714196; Wed, 04 May 2011 08:41:54 -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 cc16sm190277vdb.44.2011.05.04.08.41.53 (version=SSLv3 cipher=OTHER); Wed, 04 May 2011 08:41:53 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: add pci id to acer travelmate quirk for 5730 Date: Wed, 4 May 2011 11:41:47 -0400 Message-Id: <1304523707-4332-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]); Wed, 04 May 2011 15:42:24 +0000 (UTC) Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=34082 Reported by: Sampo Laaksonen Signed-off-by: Alex Deucher Cc: stable@kernel.org --- drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index f5d12fb..98118fd 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -431,7 +431,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, } } - /* Acer laptop (Acer TravelMate 5730G) has an HDMI port + /* Acer laptop (Acer TravelMate 5730/5730G) has an HDMI port * on the laptop and a DVI port on the docking station and * both share the same encoder, hpd pin, and ddc line. * So while the bios table is technically correct, @@ -440,7 +440,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, * with different crtcs which isn't possible on the hardware * side and leaves no crtcs for LVDS or VGA. */ - if ((dev->pdev->device == 0x95c4) && + if (((dev->pdev->device == 0x95c4) || (dev->pdev->device == 0x9591)) && (dev->pdev->subsystem_vendor == 0x1025) && (dev->pdev->subsystem_device == 0x013c)) { if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&