drm/amdgpu: bind to any 0x1002 PCI diplay class device

Bind to all 0x1002 GPU devices.

For now we explicitly return -ENODEV for generic bindings.
Remove this check once IP discovery based checking is in place.

v2: rebase (Alex)

Reviewed-by: Christian König <christian.koenig@amd.com>
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 50c06e94c8755e5ea77be4b6bc2d4ea1daf45bc2..8f863ac8d733596838761a345bec62a86b0abc7f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1870,6 +1870,16 @@ static const struct pci_device_id pciidlist[] = {
        {0x1002, 0x7423, 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, PCI_ANY_ID),
+         .class = PCI_CLASS_DISPLAY_VGA << 8,
+         .class_mask = 0xffffff,
+         .driver_data = 0 },
+
+       { PCI_DEVICE(0x1002, PCI_ANY_ID),
+         .class = PCI_CLASS_DISPLAY_OTHER << 8,
+         .class_mask = 0xffffff,
+         .driver_data = 0 },
+
        {0, 0, 0}
 };
 
@@ -1892,6 +1902,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
                        return -ENODEV;
        }
 
+       if (flags == 0) {
+               DRM_INFO("Unsupported asic.  Remove me when IP discovery init is in place.\n");
+               return -ENODEV;
+       }
+
        if (amdgpu_virtual_display ||
            amdgpu_device_asic_has_dc_support(flags & AMD_ASIC_MASK))
                supports_atomic = true;