Skip to contentSkip to conversation

drm/amdgpu: Fix rejecting Tahiti GPUs

PATCH In review Lukas Fink 2 participants 3 messages Jan 14, 2022

Subsystems (2)
lore
Share & tools
lore

Lukas Fink

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Fix rejecting Tahiti GPUs

eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") added generic bindings to amdgpu so that that it binds to all display class devices with VID 0x1002 and then rejects those in amdgpu_pci_probe.

Unfortunately it reuses a driver_data value of 0 to detect those new bindings, which is already used to denote CHIP_TAHITI ASICs.

The driver_data value given to those new bindings was changed in dd0761fd24ea1 ("drm/amdgpu: set CHIP_IP_DISCOVERY as the asic type by default") to CHIP_IP_DISCOVERY (=36), but it seems that the check in amdgpu_pci_probe was forgotten to be changed. Therefore, it still rejects Tahiti GPUs.

Fixes eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
index 9ec58bf74012..224d073022ac 100644
@@ -1903,7 +1903,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
 			return -ENODEV;
 	}
 
-	if (flags == 0) {
+	if (flags == CHIP_IP_DISCOVERY) {
 		DRM_INFO("Unsupported asic.  Remove me when IP discovery init is in place.\n");
 		return -ENODEV;
 	}
Signature · 1 line
2.34.1
#1 lore raw
Quoted 26 lines · Lukas Fink

eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") added generic bindings to amdgpu so that that it binds to all display class devices with VID 0x1002 and then rejects those in amdgpu_pci_probe.

Unfortunately it reuses a driver_data value of 0 to detect those new bindings, which is already used to denote CHIP_TAHITI ASICs.

The driver_data value given to those new bindings was changed in dd0761fd24ea1 ("drm/amdgpu: set CHIP_IP_DISCOVERY as the asic type by default") to CHIP_IP_DISCOVERY (=36), but it seems that the check in amdgpu_pci_probe was forgotten to be changed. Therefore, it still rejects Tahiti GPUs.

Fixes eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -0
index 9ec58bf74012..224d073022ac 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c static int amdgpu_pci_probe(struct pci_dev *pdev, · line 1909

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -1903,7 +1903,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
                        return -ENODEV;
        }
 
-       if (flags == 0) {
+       if (flags == CHIP_IP_DISCOVERY) {
                DRM_INFO("Unsupported asic.  Remove me when IP discovery init is in place.\n");
                return -ENODEV;
        }

Thanks. Actually this entire check can be removed at this point. The IP discovery support is in place. I'll send a patch.

Alex

Quoted 3 lines

--
2.34.1

#2 lore raw
Quoted 31 lines · Alex Deucher
Quoted 29 lines · Lukas Fink

eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device") added generic bindings to amdgpu so that that it binds to all display class devices with VID 0x1002 and then rejects those in amdgpu_pci_probe.

Unfortunately it reuses a driver_data value of 0 to detect those new bindings, which is already used to denote CHIP_TAHITI ASICs.

The driver_data value given to those new bindings was changed in dd0761fd24ea1 ("drm/amdgpu: set CHIP_IP_DISCOVERY as the asic type by default") to CHIP_IP_DISCOVERY (=36), but it seems that the check in amdgpu_pci_probe was forgotten to be changed. Therefore, it still rejects Tahiti GPUs.

Fixes eb4fd29afd4a ("drm/amdgpu: bind to any 0x1002 PCI diplay class device")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -0
index 9ec58bf74012..224d073022ac 100644
@@ -1903,7 +1903,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
                        return -ENODEV;
        }
 
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c static int amdgpu_pci_probe(struct pci_dev *pdev, · line 1909

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
-       if (flags == 0) {
+       if (flags == CHIP_IP_DISCOVERY) {
                DRM_INFO("Unsupported asic.  Remove me when IP discovery init is in place.\n");
                return -ENODEV;
        }

Thanks. Actually this entire check can be removed at this point. The IP discovery support is in place. I'll send a patch.

Actually, I'll take this patch and then send a patch to remove it on top of that. Thanks for fixing this.

Alex

Quoted 7 lines

Alex

Quoted 3 lines

--
2.34.1