From patchwork Sun Oct 26 17:22:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 5155441 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C42179F30B for ; Sun, 26 Oct 2014 17:46:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2DFD20179 for ; Sun, 26 Oct 2014 17:46:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A966E20165 for ; Sun, 26 Oct 2014 17:46:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C27D6E195; Sun, 26 Oct 2014 10:46:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 1449 seconds by postgrey-1.34 at gabe; Sun, 26 Oct 2014 10:46:47 PDT Received: from glazunov.sibelius.xs4all.nl (sibelius.xs4all.nl [83.163.83.176]) by gabe.freedesktop.org (Postfix) with ESMTP id ED6606E195 for ; Sun, 26 Oct 2014 10:46:47 -0700 (PDT) Received: from glazunov.sibelius.xs4all.nl (kettenis@localhost [127.0.0.1]) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3) with ESMTP id s9QHMaoL009091 for ; Sun, 26 Oct 2014 18:22:36 +0100 (CET) Received: (from kettenis@localhost) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3/Submit) id s9QHMahK004595; Sun, 26 Oct 2014 18:22:36 +0100 (CET) Date: Sun, 26 Oct 2014 18:22:36 +0100 (CET) Message-Id: <201410261722.s9QHMahK004595@glazunov.sibelius.xs4all.nl> From: Mark Kettenis To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: bogus PCI ID X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All evidence I can find suggests that device ID 0x4c6e is the "secondary" device for the Radeon Mobility 9000/M9. As such it would be an RV250 chip instead of RV280. However, the radeon drm driver doesn't actually handle "secondary" devices. For example, the (non-Mobility) Radeon 9000 with device ID 496e isn't listed. So I believe this specific device ID should be removed from the list. All it currently accomplishes is printing "Fatal error during GPU init" after the driver fails to map PCI BAR 2, which isn't there on these "secondary" devices. Tested (on OpenBSD) on a FireMV 2400 PCI card, which is essentially two Mobility M9's with a PCI-PCI bridge, and where the two 0x4c6e secondaries on function 1 are paired with 0x4c66 primaries on function 0. Hopefully this diff can be applied to the Linux kernel as well such that we can keep drm_pciids.h in sync between the various OSes. Thanks, Mark diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h index e973540..2dd405c 100644 --- a/include/drm/drm_pciids.h +++ b/include/drm/drm_pciids.h @@ -74,7 +74,6 @@ {0x1002, 0x4C64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ - {0x1002, 0x4C6E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|RADEON_IS_MOBILITY}, \ {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \