From nobody Tue Jun 16 19:34:27 2026 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4740340FDBE for ; Wed, 29 Apr 2026 17:16:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777483019; cv=none; b=bKL8vkto+80SuA6NgQtHfvJpz9K2fXzr/jMspWjyUfs7udJcV/3Dv/NiBGFoPjR0txDyuff0tS42Hwtx08Yf5kCiO9PDOnDV4cGOWm51q3ZDcUtokdMWdg1Gdwid3iQbmVR/0eBCMItbgLYBBKHob6pnfjWrMxA1XvVQacJOVuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777483019; c=relaxed/simple; bh=f+QeEXNvi5KNQhnIAw3SeS/AzSkJ18kLoUUlU5IUBgI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=U89MOJmnzv1hSbgdNI1aSA16FCO4lYUxx75CBn9LYk9n1BCfbSjR7tua1N+k0fyoiz3IfQ8Xa74pgAsHjtjjWf1oQSBGE1HnvAxF9ZfhDjqbHWpkgLccnLeMp0LAaq6vUk7OF1TdDzuJO3Ii/MQDopRlbT9WcajvCgqQy1LhHRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b=w2XNIj7L; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20251104.gappssmtp.com header.i=@baylibre-com.20251104.gappssmtp.com header.b="w2XNIj7L" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-4486b5fcf3cso40559f8f.2 for ; Wed, 29 Apr 2026 10:16:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20251104.gappssmtp.com; s=20251104; t=1777483012; x=1778087812; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fURcRTpJAse9Xxb8caLwT/PbiazdisqtC7oZm1DuK1w=; b=w2XNIj7LaDwf2ODCyVjoeF09guULrBWmP+LA+nztqDLikdDx7+0M4pLzZbKGVYHu+6 jMuvyG565utNWlMJUX0ezeNT/qgOYFGXWZ/uNmdaA+c0eKktHz+mZEmoOGGbZfTybEcl nqHAAOhMJ91YVOIO9Le+92KytK2Q8QkIJPSa1sAv7EhfMZcXrrkTqwZFTWkqrtMoOvu+ /FmmfeOYd4R0pDSJpZIyD+b02xMBdGASXW5mjPY9aTW7eZsEX7YvCFN2H3KZCycp2c1Q Mg42YUdPKQvniRKumFAKdgHlzz7zmvq/oW1r5rC8UiWqg9CzPwhfN5uyrB0S4RLeyC9N X5Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777483012; x=1778087812; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fURcRTpJAse9Xxb8caLwT/PbiazdisqtC7oZm1DuK1w=; b=ajDgst4oXLkN3/LJN/4bu7oOpR1vJ4i/W6Hna94dGm6KBz71vnwZx/WasVLz9W8D/m EGnUbV7kA/7Ahp5NH3vyhoPqUUWGND+5kR+ZM6PiNxj7gS30rKdP7mlL4GDh48OJ95q3 KpvhV3pkCwWVa6CHTnVkk5RVN8Ub2t4FkeKndF3/aRAtm/ijzNDEnGEhbFBh3DWOu8oa JmpFUwQmLg2/CydBfHYi0+7DbUst34DijoVWb+cj/hXXgmpmCv1M4MGEIjJkKHGrOlea xz/fMIC0OOuGDuJAIYn4rKlQh55upASzBOxX9nro0VBtBLdKXnGtEO3OUwRkzuztKGNo pQJg== X-Forwarded-Encrypted: i=1; AFNElJ95OhJiQREDgNZnib5jpqgvIp5Akd6e6m/HRz5aIRcC/5EXk94O8cursAJmQhNjPK/D5+BQSh/8FBWKC6c=@vger.kernel.org X-Gm-Message-State: AOJu0YwWo5KwGZR9IcUO4S20DEMgSpgDxiCh74oqcRabUpvSU5engbMA Ufn6ikEooCxuBuYKAFsjmVI8xPCvTETR+7Cxb68cupeWjJzOxv2CE2CzkeFUfnCLZfI= X-Gm-Gg: AeBDievKpKyDmV9AMK+ekY6kUdJp5/n+So4gfr3IDtaPPB7rS3QmDKiJnRFaLbr1KSK IHZr/GecP1idc5OxxB7XLbxZgBmFNqxFU5KMLai1DWa+u7YeYvzG45cLXcUQQEP4fDqa12cAWoG 2OtOE1tJCZRS6yscLl+3XrJu1lBt1uzkrVElPuaPBpths+N4qX/85kH+XMke9s3EUNQ0TozCCdY PCGhOl4AUB8UuMe2BwfOlV+4JnIPr1GQPqyATOY36O+TOGudRlnL6YrZll+RObyNOEx6cYqbxqz wquGFXFCwiheyyUpCgmbQFYUTmdv2QwPAI7j+qBYk6W9bGxGUFrG9dG9xuezAHnTyWX3+x5pTFl gFvokX7Mh8lHRSEj/5sHHEpbBiZSl8vyqNnRyTiCaPQV6iuzj+Z1LRbzrnTNjEQNQK4w7eeNue5 fWMlGt4LcBVa7MFDEEBkQBTyXzl2vxhfV8tKTjghHX5uFpN4xsO+a0jcR2IqBYJPBYVBJdu55lC 67KrjImCONUfQUTpw3PfEilBg== X-Received: by 2002:a05:6000:40cb:b0:43d:184:8a9c with SMTP id ffacd0b85a97d-44647be5f1amr14944569f8f.12.1777483011252; Wed, 29 Apr 2026 10:16:51 -0700 (PDT) Received: from localhost (p200300f65f114e0863aeabccc171bdd2.dip0.t-ipconnect.de. [2003:f6:5f11:4e08:63ae:abcc:c171:bdd2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-447b7ca664csm7444563f8f.35.2026.04.29.10.16.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 10:16:50 -0700 (PDT) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= To: Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= Cc: Markus Schneider-Pargmann , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/amdgpu: Consistently define pci_device_ids using named initializers Date: Wed, 29 Apr 2026 19:16:44 +0200 Message-ID: <20260429171644.8406-2-u.kleine-koenig@baylibre.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=46669; i=u.kleine-koenig@baylibre.com; h=from:subject; bh=f+QeEXNvi5KNQhnIAw3SeS/AzSkJ18kLoUUlU5IUBgI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBp8jz8luyvYolv90hYhO3yyXWQtwaeLmKfeRA8J rkyOxlFM+2JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCafI8/AAKCRCPgPtYfRL+ ThUDB/9JGBW97z9FzSGbXGCl3iiW+MxFsHj5D9AeAaIHma4uDnL6M20uzOpzhlL9qxtaZzIhrUi 0kc3thO8DP+95JtQocMoF14bYx+//rkXZMfokQNp+7t2KtorETNMPyYwV1wIdZshI0r4E+aN8rc ouorxma5jib+J5He6qSNDpNJFJxXO5cROpr3CwNsDHaS0fwTyWGhZp23puhYJm83UQpvzlP3UQZ c+EbLdaXMlRc1NCehLhZHEVr77szy70UMYl26c3yhFxrRfUehTV+9PPp0rYBT9B8pcflcRGWgG8 5S0E4ZCkRq0OPvJlcbceDED+WuTq6bfKMtdoa6+l2C53T3/w X-Developer-Key: i=u.kleine-koenig@baylibre.com; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable ... and PCI device helpers. The struct pci_device_id array of supported device was initialized by list expressions. This isn't easily readable if you're not into PCI. Use PCI_DEVICE* helper macros and named initializers which is more explicit and thus easier to parse. Also skip explicit assignments of 0 (which the compiler then takes care of). The secret plan is to make struct pci_device_id::driver_data an anonymous union (similar to https://lore.kernel.org/all/cover.1776579304.git.u.kleine-koenig@baylibre.c= om/) and that requires named initializers. But it's also a nice cleanup on its own. This change doesn't introduce changes to the compiled pci_device_id array. Tested on x86 and arm64. Signed-off-by: Uwe Kleine-K=C3=B6nig (The Capable Hub) --- Hello, the mentioned follow-up quest isn't relevant to this driver. For other drivers it allows to do - { PCI_VDEVICE(TTI, 0x3220), .driver_data =3D (kernel_ulong_t)&hptiop_itl= _ops }, + { PCI_VDEVICE(TTI, 0x3220), .driver_data_ptr =3D &hptiop_itl_ops }, which gets rid of a bunch of casts and so brings a little bit more type safety. This patch is a preparation for that. Best regards Uwe drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 618 ++++++++++++------------ 1 file changed, 309 insertions(+), 309 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_drv.c index e47921e2a9af..8b71834a73df 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1825,353 +1825,353 @@ static const u16 amdgpu_unsupported_pciidlist[] = =3D { }; =20 static const struct pci_device_id pciidlist[] =3D { - {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6784, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x678A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6790, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6791, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6792, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x679B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x679E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x679F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, - {0x1002, 0x6800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|AMD_IS_MOBIL= ITY}, - {0x1002, 0x6801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|AMD_IS_MOBIL= ITY}, - {0x1002, 0x6802, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|AMD_IS_MOBIL= ITY}, - {0x1002, 0x6806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6819, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN}, - {0x1002, 0x6600, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6602, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6603, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6604, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6605, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6606, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6607, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6608, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND}, - {0x1002, 0x6610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND}, - {0x1002, 0x6611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND}, - {0x1002, 0x6613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND}, - {0x1002, 0x6617, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6620, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6623, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|AMD_IS_MOBILITY= }, - {0x1002, 0x6631, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND}, - {0x1002, 0x6820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6823, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6826, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x682A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x682C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|AMD_IS_MOBILITY= }, - {0x1002, 0x6835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x683B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x683D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x683F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE}, - {0x1002, 0x6660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, - {0x1002, 0x6663, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, - {0x1002, 0x6664, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, - {0x1002, 0x6665, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, - {0x1002, 0x6667, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, - {0x1002, 0x666F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|AMD_IS_MOBILIT= Y}, + { PCI_DEVICE(0x1002, 0x6780), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6784), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6788), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x678A), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6790), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6791), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6792), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6798), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6799), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x679A), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x679B), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x679E), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x679F), .driver_data =3D CHIP_TAHITI }, + { PCI_DEVICE(0x1002, 0x6800), .driver_data =3D CHIP_PITCAIRN|AMD_IS_MOBIL= ITY }, + { PCI_DEVICE(0x1002, 0x6801), .driver_data =3D CHIP_PITCAIRN|AMD_IS_MOBIL= ITY }, + { PCI_DEVICE(0x1002, 0x6802), .driver_data =3D CHIP_PITCAIRN|AMD_IS_MOBIL= ITY }, + { PCI_DEVICE(0x1002, 0x6806), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6808), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6809), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6810), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6811), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6816), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6817), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6818), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6819), .driver_data =3D CHIP_PITCAIRN }, + { PCI_DEVICE(0x1002, 0x6600), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6601), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6602), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6603), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6604), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6605), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6606), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6607), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6608), .driver_data =3D CHIP_OLAND }, + { PCI_DEVICE(0x1002, 0x6610), .driver_data =3D CHIP_OLAND }, + { PCI_DEVICE(0x1002, 0x6611), .driver_data =3D CHIP_OLAND }, + { PCI_DEVICE(0x1002, 0x6613), .driver_data =3D CHIP_OLAND }, + { PCI_DEVICE(0x1002, 0x6617), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6620), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6621), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6623), .driver_data =3D CHIP_OLAND|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6631), .driver_data =3D CHIP_OLAND }, + { PCI_DEVICE(0x1002, 0x6820), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6821), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6822), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6823), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6824), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6825), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6826), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6827), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6828), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x6829), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x682A), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x682B), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x682C), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x682D), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x682F), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6830), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6831), .driver_data =3D CHIP_VERDE|AMD_IS_MOBILITY= }, + { PCI_DEVICE(0x1002, 0x6835), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x6837), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x6838), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x6839), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x683B), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x683D), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x683F), .driver_data =3D CHIP_VERDE }, + { PCI_DEVICE(0x1002, 0x6660), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, + { PCI_DEVICE(0x1002, 0x6663), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, + { PCI_DEVICE(0x1002, 0x6664), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, + { PCI_DEVICE(0x1002, 0x6665), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, + { PCI_DEVICE(0x1002, 0x6667), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, + { PCI_DEVICE(0x1002, 0x666F), .driver_data =3D CHIP_HAINAN|AMD_IS_MOBILIT= Y }, /* Kaveri */ - {0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1306, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x1307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1309, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x130F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1313, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1316, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x1317, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x1318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, - {0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x1304), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1305), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1306), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1307), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1309), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130A), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130B), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130C), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130D), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130E), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x130F), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1310), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1311), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1312), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1313), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1315), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1316), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1317), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1318), .driver_data =3D CHIP_KAVERI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x131B), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x131C), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x131D), .driver_data =3D CHIP_KAVERI|AMD_IS_APU }, /* Bonaire */ - {0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILI= TY}, - {0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILI= TY}, - {0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILI= TY}, - {0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|AMD_IS_MOBILI= TY}, - {0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x6658, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x665c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x665d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, - {0x1002, 0x665f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE}, + { PCI_DEVICE(0x1002, 0x6640), .driver_data =3D CHIP_BONAIRE|AMD_IS_MOBILI= TY }, + { PCI_DEVICE(0x1002, 0x6641), .driver_data =3D CHIP_BONAIRE|AMD_IS_MOBILI= TY }, + { PCI_DEVICE(0x1002, 0x6646), .driver_data =3D CHIP_BONAIRE|AMD_IS_MOBILI= TY }, + { PCI_DEVICE(0x1002, 0x6647), .driver_data =3D CHIP_BONAIRE|AMD_IS_MOBILI= TY }, + { PCI_DEVICE(0x1002, 0x6649), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x6650), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x6651), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x6658), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x665c), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x665d), .driver_data =3D CHIP_BONAIRE }, + { PCI_DEVICE(0x1002, 0x665f), .driver_data =3D CHIP_BONAIRE }, /* Hawaii */ - {0x1002, 0x67A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67A8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67A9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67AA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67B0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67B1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67B8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67B9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67BA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, - {0x1002, 0x67BE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII}, + { PCI_DEVICE(0x1002, 0x67A0), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67A1), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67A2), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67A8), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67A9), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67AA), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67B0), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67B1), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67B8), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67B9), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67BA), .driver_data =3D CHIP_HAWAII }, + { PCI_DEVICE(0x1002, 0x67BE), .driver_data =3D CHIP_HAWAII }, /* Kabini */ - {0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU}, - {0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, - {0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x9830), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9831), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9832), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9833), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9834), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9835), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9836), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9837), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9838), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9839), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983a), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983b), .driver_data =3D CHIP_KABINI|AMD_IS_MOBILIT= Y|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983c), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983d), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983e), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x983f), .driver_data =3D CHIP_KABINI|AMD_IS_APU }, /* mullins */ - {0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, - {0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x9850), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9851), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9852), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9853), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9854), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9855), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9856), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9857), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9858), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9859), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985A), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985B), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985C), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985D), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985E), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x985F), .driver_data =3D CHIP_MULLINS|AMD_IS_MOBILI= TY|AMD_IS_APU }, /* topaz */ - {0x1002, 0x6900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, - {0x1002, 0x6901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, - {0x1002, 0x6902, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, - {0x1002, 0x6903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, - {0x1002, 0x6907, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TOPAZ}, + { PCI_DEVICE(0x1002, 0x6900), .driver_data =3D CHIP_TOPAZ }, + { PCI_DEVICE(0x1002, 0x6901), .driver_data =3D CHIP_TOPAZ }, + { PCI_DEVICE(0x1002, 0x6902), .driver_data =3D CHIP_TOPAZ }, + { PCI_DEVICE(0x1002, 0x6903), .driver_data =3D CHIP_TOPAZ }, + { PCI_DEVICE(0x1002, 0x6907), .driver_data =3D CHIP_TOPAZ }, /* tonga */ - {0x1002, 0x6920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6929, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x692B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x692F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6930, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, - {0x1002, 0x6939, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TONGA}, + { PCI_DEVICE(0x1002, 0x6920), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6921), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6928), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6929), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x692B), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x692F), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6930), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6938), .driver_data =3D CHIP_TONGA }, + { PCI_DEVICE(0x1002, 0x6939), .driver_data =3D CHIP_TONGA }, /* fiji */ - {0x1002, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_FIJI}, - {0x1002, 0x730F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_FIJI}, + { PCI_DEVICE(0x1002, 0x7300), .driver_data =3D CHIP_FIJI }, + { PCI_DEVICE(0x1002, 0x730F), .driver_data =3D CHIP_FIJI }, /* carrizo */ - {0x1002, 0x9870, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, - {0x1002, 0x9874, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, - {0x1002, 0x9875, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, - {0x1002, 0x9876, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, - {0x1002, 0x9877, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CARRIZO|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x9870), .driver_data =3D CHIP_CARRIZO|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9874), .driver_data =3D CHIP_CARRIZO|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9875), .driver_data =3D CHIP_CARRIZO|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9876), .driver_data =3D CHIP_CARRIZO|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x9877), .driver_data =3D CHIP_CARRIZO|AMD_IS_APU }, /* stoney */ - {0x1002, 0x98E4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_STONEY|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x98E4), .driver_data =3D CHIP_STONEY|AMD_IS_APU }, /* Polaris11 */ - {0x1002, 0x67E0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67E3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67E8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67EB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67EF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67FF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67E1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67E7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, - {0x1002, 0x67E9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS11}, + { PCI_DEVICE(0x1002, 0x67E0), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67E3), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67E8), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67EB), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67EF), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67FF), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67E1), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67E7), .driver_data =3D CHIP_POLARIS11 }, + { PCI_DEVICE(0x1002, 0x67E9), .driver_data =3D CHIP_POLARIS11 }, /* Polaris10 */ - {0x1002, 0x67C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67D0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67C9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, - {0x1002, 0x6FDF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10}, + { PCI_DEVICE(0x1002, 0x67C0), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C1), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C2), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C4), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C7), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67D0), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67DF), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C8), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67C9), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67CA), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67CC), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x67CF), .driver_data =3D CHIP_POLARIS10 }, + { PCI_DEVICE(0x1002, 0x6FDF), .driver_data =3D CHIP_POLARIS10 }, /* Polaris12 */ - {0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x6997, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, - {0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + { PCI_DEVICE(0x1002, 0x6980), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6981), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6985), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6986), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6987), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6995), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x6997), .driver_data =3D CHIP_POLARIS12 }, + { PCI_DEVICE(0x1002, 0x699F), .driver_data =3D CHIP_POLARIS12 }, /* VEGAM */ - {0x1002, 0x694C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM}, - {0x1002, 0x694E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM}, - {0x1002, 0x694F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGAM}, + { PCI_DEVICE(0x1002, 0x694C), .driver_data =3D CHIP_VEGAM }, + { PCI_DEVICE(0x1002, 0x694E), .driver_data =3D CHIP_VEGAM }, + { PCI_DEVICE(0x1002, 0x694F), .driver_data =3D CHIP_VEGAM }, /* Vega 10 */ - {0x1002, 0x6860, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6861, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6862, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6863, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6864, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6867, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6868, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x6869, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x686f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, - {0x1002, 0x687f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10}, + { PCI_DEVICE(0x1002, 0x6860), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6861), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6862), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6863), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6864), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6867), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6868), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x6869), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686a), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686b), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686c), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686d), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686e), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x686f), .driver_data =3D CHIP_VEGA10 }, + { PCI_DEVICE(0x1002, 0x687f), .driver_data =3D CHIP_VEGA10 }, /* Vega 12 */ - {0x1002, 0x69A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, - {0x1002, 0x69A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, - {0x1002, 0x69A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, - {0x1002, 0x69A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, - {0x1002, 0x69AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12}, + { PCI_DEVICE(0x1002, 0x69A0), .driver_data =3D CHIP_VEGA12 }, + { PCI_DEVICE(0x1002, 0x69A1), .driver_data =3D CHIP_VEGA12 }, + { PCI_DEVICE(0x1002, 0x69A2), .driver_data =3D CHIP_VEGA12 }, + { PCI_DEVICE(0x1002, 0x69A3), .driver_data =3D CHIP_VEGA12 }, + { PCI_DEVICE(0x1002, 0x69AF), .driver_data =3D CHIP_VEGA12 }, /* Vega 20 */ - {0x1002, 0x66A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66A7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, - {0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20}, + { PCI_DEVICE(0x1002, 0x66A0), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66A1), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66A2), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66A3), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66A4), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66A7), .driver_data =3D CHIP_VEGA20 }, + { PCI_DEVICE(0x1002, 0x66AF), .driver_data =3D CHIP_VEGA20 }, /* Raven */ - {0x1002, 0x15dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, - {0x1002, 0x15d8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RAVEN|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x15dd), .driver_data =3D CHIP_RAVEN|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x15d8), .driver_data =3D CHIP_RAVEN|AMD_IS_APU }, /* Arcturus */ - {0x1002, 0x738C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS}, - {0x1002, 0x7388, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS}, - {0x1002, 0x738E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS}, - {0x1002, 0x7390, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARCTURUS}, + { PCI_DEVICE(0x1002, 0x738C), .driver_data =3D CHIP_ARCTURUS }, + { PCI_DEVICE(0x1002, 0x7388), .driver_data =3D CHIP_ARCTURUS }, + { PCI_DEVICE(0x1002, 0x738E), .driver_data =3D CHIP_ARCTURUS }, + { PCI_DEVICE(0x1002, 0x7390), .driver_data =3D CHIP_ARCTURUS }, /* Navi10 */ - {0x1002, 0x7310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x7312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x7318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x7319, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x731A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x731B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x731E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, - {0x1002, 0x731F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI10}, + { PCI_DEVICE(0x1002, 0x7310), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x7312), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x7318), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x7319), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x731A), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x731B), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x731E), .driver_data =3D CHIP_NAVI10 }, + { PCI_DEVICE(0x1002, 0x731F), .driver_data =3D CHIP_NAVI10 }, /* Navi14 */ - {0x1002, 0x7340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14}, - {0x1002, 0x7341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14}, - {0x1002, 0x7347, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14}, - {0x1002, 0x734F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI14}, + { PCI_DEVICE(0x1002, 0x7340), .driver_data =3D CHIP_NAVI14 }, + { PCI_DEVICE(0x1002, 0x7341), .driver_data =3D CHIP_NAVI14 }, + { PCI_DEVICE(0x1002, 0x7347), .driver_data =3D CHIP_NAVI14 }, + { PCI_DEVICE(0x1002, 0x734F), .driver_data =3D CHIP_NAVI14 }, =20 /* Renoir */ - {0x1002, 0x15E7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, - {0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, - {0x1002, 0x1638, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, - {0x1002, 0x164C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU}, + { PCI_DEVICE(0x1002, 0x15E7), .driver_data =3D CHIP_RENOIR|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1636), .driver_data =3D CHIP_RENOIR|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x1638), .driver_data =3D CHIP_RENOIR|AMD_IS_APU }, + { PCI_DEVICE(0x1002, 0x164C), .driver_data =3D CHIP_RENOIR|AMD_IS_APU }, =20 /* Navi12 */ - {0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12}, - {0x1002, 0x7362, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12}, + { PCI_DEVICE(0x1002, 0x7360), .driver_data =3D CHIP_NAVI12 }, + { PCI_DEVICE(0x1002, 0x7362), .driver_data =3D CHIP_NAVI12 }, =20 /* Sienna_Cichlid */ - {0x1002, 0x73A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73A9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73AB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73AC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73AD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73AE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, - {0x1002, 0x73BF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID}, + { PCI_DEVICE(0x1002, 0x73A0), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A1), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A2), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A3), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A5), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A8), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73A9), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73AB), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73AC), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73AD), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73AE), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73AF), .driver_data =3D CHIP_SIENNA_CICHLID }, + { PCI_DEVICE(0x1002, 0x73BF), .driver_data =3D CHIP_SIENNA_CICHLID }, =20 /* Yellow Carp */ - {0x1002, 0x164D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_AP= U}, - {0x1002, 0x1681, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_AP= U}, + { PCI_DEVICE(0x1002, 0x164D), .driver_data =3D CHIP_YELLOW_CARP|AMD_IS_AP= U }, + { PCI_DEVICE(0x1002, 0x1681), .driver_data =3D CHIP_YELLOW_CARP|AMD_IS_AP= U }, =20 /* Navy_Flounder */ - {0x1002, 0x73C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73C3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, - {0x1002, 0x73DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER}, + { PCI_DEVICE(0x1002, 0x73C0), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73C1), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73C3), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DA), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DB), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DC), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DD), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DE), .driver_data =3D CHIP_NAVY_FLOUNDER }, + { PCI_DEVICE(0x1002, 0x73DF), .driver_data =3D CHIP_NAVY_FLOUNDER }, =20 /* DIMGREY_CAVEFISH */ - {0x1002, 0x73E0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73E1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73E2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73E3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73E8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73E9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73EA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73EB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73EC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73ED, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73EF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, - {0x1002, 0x73FF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_DIMGREY_CAVEFISH}, + { PCI_DEVICE(0x1002, 0x73E0), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73E1), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73E2), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73E3), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73E8), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73E9), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73EA), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73EB), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73EC), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73ED), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73EF), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, + { PCI_DEVICE(0x1002, 0x73FF), .driver_data =3D CHIP_DIMGREY_CAVEFISH }, =20 /* Aldebaran */ - {0x1002, 0x7408, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN}, - {0x1002, 0x740C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN}, - {0x1002, 0x740F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN}, - {0x1002, 0x7410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN}, + { PCI_DEVICE(0x1002, 0x7408), .driver_data =3D CHIP_ALDEBARAN }, + { PCI_DEVICE(0x1002, 0x740C), .driver_data =3D CHIP_ALDEBARAN }, + { PCI_DEVICE(0x1002, 0x740F), .driver_data =3D CHIP_ALDEBARAN }, + { PCI_DEVICE(0x1002, 0x7410), .driver_data =3D CHIP_ALDEBARAN }, =20 /* CYAN_SKILLFISH */ - {0x1002, 0x13DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x13F9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x13FA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x13FB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x13FC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x13FE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, - {0x1002, 0x143F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS= _APU}, + { PCI_DEVICE(0x1002, 0x13DB), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x13F9), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x13FA), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x13FB), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x13FC), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x13FE), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, + { PCI_DEVICE(0x1002, 0x143F), .driver_data =3D CHIP_CYAN_SKILLFISH|AMD_IS= _APU }, =20 /* BEIGE_GOBY */ - {0x1002, 0x7420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x7421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x7422, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x7423, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x7424, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, - {0x1002, 0x743F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY}, + { PCI_DEVICE(0x1002, 0x7420), .driver_data =3D CHIP_BEIGE_GOBY }, + { PCI_DEVICE(0x1002, 0x7421), .driver_data =3D CHIP_BEIGE_GOBY }, + { PCI_DEVICE(0x1002, 0x7422), .driver_data =3D CHIP_BEIGE_GOBY }, + { PCI_DEVICE(0x1002, 0x7423), .driver_data =3D CHIP_BEIGE_GOBY }, + { PCI_DEVICE(0x1002, 0x7424), .driver_data =3D CHIP_BEIGE_GOBY }, + { PCI_DEVICE(0x1002, 0x743F), .driver_data =3D CHIP_BEIGE_GOBY }, =20 { PCI_DEVICE(0x1002, PCI_ANY_ID), .class =3D PCI_CLASS_DISPLAY_VGA << 8, @@ -2188,7 +2188,7 @@ static const struct pci_device_id pciidlist[] =3D { .class_mask =3D 0xffffff, .driver_data =3D CHIP_IP_DISCOVERY }, =20 - {0, 0, 0} + { } }; =20 MODULE_DEVICE_TABLE(pci, pciidlist); base-commit: 254f49634ee16a731174d2ae34bc50bd5f45e731 --=20 2.47.3