TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: handle polaris10/11 overlap asics (v2)

Browse Source 
commit 1d4624cd72 upstream.

Some special polaris 10 chips overlap with the polaris11
DID range.  Handle this properly in the driver.

v2: use local flags for other function calls.

Acked-by: Luben Tuikov <luben.tuikov@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alex Deucher
2022-11-21 15:52:19 -05:00
committed by Greg Kroah-Hartman
parent 30e95fdc96
commit dfc01905b8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+11 -2
View File
@@ -1121,6 +1121,15 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
"See modparam exp_hw_support\n"); "See modparam exp_hw_support\n");
return -ENODEV; return -ENODEV;
} }
/* differentiate between P10 and P11 asics with the same DID */
if (pdev->device == 0x67FF &&
(pdev->revision == 0xE3 ||
pdev->revision == 0xE7 ||
pdev->revision == 0xF3 ||
pdev->revision == 0xF7)) {
flags &= ~AMD_ASIC_MASK;
flags |= CHIP_POLARIS10;
}
/* Due to hardware bugs, S/G Display on raven requires a 1:1 IOMMU mapping, /* Due to hardware bugs, S/G Display on raven requires a 1:1 IOMMU mapping,
* however, SME requires an indirect IOMMU mapping because the encryption * however, SME requires an indirect IOMMU mapping because the encryption
@@ -1190,12 +1199,12 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
ddev->pdev = pdev; ddev->pdev = pdev;
pci_set_drvdata(pdev, ddev); pci_set_drvdata(pdev, ddev);
ret = amdgpu_driver_load_kms(adev, ent->driver_data); ret = amdgpu_driver_load_kms(adev, flags);
if (ret) if (ret)
goto err_pci; goto err_pci;
retry_init: retry_init:
ret = drm_dev_register(ddev, ent->driver_data); ret = drm_dev_register(ddev, flags);
if (ret == -EAGAIN && ++retry <= 3) { if (ret == -EAGAIN && ++retry <= 3) {
DRM_INFO("retry init %d\n", retry); DRM_INFO("retry init %d\n", retry);
/* Don't request EX mode too frequently which is attacking */ /* Don't request EX mode too frequently which is attacking */