|
@@ -55,6 +55,11 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev);
|
|
|
static void amdgpu_debugfs_regs_cleanup(struct amdgpu_device *adev);
|
|
|
|
|
|
static const char *amdgpu_asic_name[] = {
|
|
|
+ "TAHITI",
|
|
|
+ "PITCAIRN",
|
|
|
+ "VERDE",
|
|
|
+ "OLAND",
|
|
|
+ "HAINAN",
|
|
|
"BONAIRE",
|
|
|
"KAVERI",
|
|
|
"KABINI",
|
|
@@ -1571,8 +1576,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
|
|
INIT_LIST_HEAD(&adev->shadow_list);
|
|
|
mutex_init(&adev->shadow_list_lock);
|
|
|
|
|
|
- adev->rmmio_base = pci_resource_start(adev->pdev, 5);
|
|
|
- adev->rmmio_size = pci_resource_len(adev->pdev, 5);
|
|
|
+ if (adev->asic_type >= CHIP_BONAIRE) {
|
|
|
+ adev->rmmio_base = pci_resource_start(adev->pdev, 5);
|
|
|
+ adev->rmmio_size = pci_resource_len(adev->pdev, 5);
|
|
|
+ } else {
|
|
|
+ adev->rmmio_base = pci_resource_start(adev->pdev, 2);
|
|
|
+ adev->rmmio_size = pci_resource_len(adev->pdev, 2);
|
|
|
+ }
|
|
|
adev->rmmio = ioremap(adev->rmmio_base, adev->rmmio_size);
|
|
|
if (adev->rmmio == NULL) {
|
|
|
return -ENOMEM;
|
|
@@ -1580,8 +1590,9 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
|
|
DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)adev->rmmio_base);
|
|
|
DRM_INFO("register mmio size: %u\n", (unsigned)adev->rmmio_size);
|
|
|
|
|
|
- /* doorbell bar mapping */
|
|
|
- amdgpu_doorbell_init(adev);
|
|
|
+ if (adev->asic_type >= CHIP_BONAIRE)
|
|
|
+ /* doorbell bar mapping */
|
|
|
+ amdgpu_doorbell_init(adev);
|
|
|
|
|
|
/* io port mapping */
|
|
|
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
|
|
@@ -1790,7 +1801,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
|
|
|
adev->rio_mem = NULL;
|
|
|
iounmap(adev->rmmio);
|
|
|
adev->rmmio = NULL;
|
|
|
- amdgpu_doorbell_fini(adev);
|
|
|
+ if (adev->asic_type >= CHIP_BONAIRE)
|
|
|
+ amdgpu_doorbell_fini(adev);
|
|
|
amdgpu_debugfs_regs_cleanup(adev);
|
|
|
amdgpu_debugfs_remove_files(adev);
|
|
|
}
|