From patchwork Fri Feb 19 02:56:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 45834 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D6EDCB7CFA for ; Fri, 19 Feb 2010 13:56:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754148Ab0BSC4c (ORCPT ); Thu, 18 Feb 2010 21:56:32 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:43573 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754143Ab0BSC4c convert rfc822-to-8bit (ORCPT ); Thu, 18 Feb 2010 21:56:32 -0500 Received: from deadeye.i.decadent.org.uk ([192.168.2.105] helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NiJ2V-0002Gb-Nt; Fri, 19 Feb 2010 02:56:24 +0000 Received: from womble by localhost with local (Exim 4.71) (envelope-from ) id 1NiJ2T-0005KL-VE; Fri, 19 Feb 2010 02:56:21 +0000 From: Ben Hutchings To: David Miller Cc: Jurij Smakov , sparclinux@vger.kernel.org, 508108@bugs.debian.org Date: Fri, 19 Feb 2010 02:56:21 +0000 Message-ID: <1266548181.10567.727.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 X-SA-Exim-Connect-IP: 192.168.2.105 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.2.5 Subject: [PATCH] Additional PCI id for sunxvr500 driver X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Intergraph bought 3D Labs and some XVR-500 chips have Intergraph's vendor id. Reported-by: Jurij Smakov Signed-off-by: Ben Hutchings Cc: stable@kernel.org --- Jurij Smakov wrote on 2008-12-01: > Hi, > > My SunBlade 1000 has the following graphics chip: > > 0000:00:01.0 VGA compatible controller: Intergraph Corporation Sun Expert3D-Lite Graphics Accelerator > > with PCI ID 1091:07a0 (vendor ID is Intergraph Corporation). I've > noticed that XVR-500 framebuffer driver (drivers/video/sunxvr500.c) > supports the framebuffer device 3d3d:07a0, which only has the same > device ID but a different vendor (3D Labs). Given that 3D Labs bought > up Intergraph Corporation at some point, it's probably the same chip, > so I tried adding 1091:07a0 to the list of supported PCI IDs for > sunxvr500.c and it worked without problems, the console now is much > nicer than the default PROM monochrome one. Please consider applying > the included patch, which adds this card to the list of supported > devices for XVR-500 driver. Jurij originally posted a patch for sunxvr500 which also touched pci_ids.h. This is the same thing without involving pci_ids.h. Ben. --- --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c @@ -400,6 +400,7 @@ static struct pci_device_id e3d_pci_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0), }, + { PCI_DEVICE(0x1091, 0x7a0), }, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2), }, { .vendor = PCI_VENDOR_ID_3DLABS, .device = PCI_ANY_ID,