drm/amdgpu: add the accelerator PCIe class

Add the accelerator PCIe class and match the
class in amdgpu for 0x1002 devices of that class.

From PCI spec:
"PCI Code and ID Assignment, r1.9, sec 1, 1.19"

Signed-off-by: Shiwu Zhang <shiwu.zhang@amd.com>
Acked-by: Lijo Lazar <lijo.lazar@amd.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>  # pci_ids.h
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index b8a1e45..8e58d18 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -2044,7 +2044,7 @@ static const struct pci_device_id pciidlist[] = {
          .driver_data = CHIP_IP_DISCOVERY },
 
        { PCI_DEVICE(0x1002, PCI_ANY_ID),
-         .class = AMD_ACCELERATOR_PROCESSING << 8,
+         .class = PCI_CLASS_ACCELERATOR_PROCESSING << 8,
          .class_mask = 0xffffff,
          .driver_data = CHIP_IP_DISCOVERY },
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 0f1ca01..25b4d7f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -57,7 +57,7 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
        /* enable virtual display */
        if (adev->asic_type != CHIP_ALDEBARAN &&
            adev->asic_type != CHIP_ARCTURUS &&
-           ((adev->pdev->class >> 8) != AMD_ACCELERATOR_PROCESSING)) {
+           ((adev->pdev->class >> 8) != PCI_CLASS_ACCELERATOR_PROCESSING)) {
                if (adev->mode_info.num_crtc == 0)
                        adev->mode_info.num_crtc = 1;
                adev->enable_virtual_display = true;

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 57d95e2..f175e65 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -27,7 +27,6 @@
 
 
 #define AMD_MAX_USEC_TIMEOUT           1000000  /* 1000 ms */
-#define AMD_ACCELERATOR_PROCESSING     0x1200   /* hardcoded pci class */
 
 /*
  * Chip flags

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 45c3d62..0fbfbda 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -151,6 +151,9 @@
 #define PCI_CLASS_SP_DPIO              0x1100
 #define PCI_CLASS_SP_OTHER             0x1180
 
+#define PCI_BASE_CLASS_ACCELERATOR     0x12
+#define PCI_CLASS_ACCELERATOR_PROCESSING       0x1200
+
 #define PCI_CLASS_OTHERS               0xff
 
 /* Vendors and devices.  Sort key: vendor first, device next. */