Commit 6585661d authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdgpu: Call doorbell index init on device initialization 



Also call functioin amdgpu_device_doorbell_init after
amdgpu_device_ip_early_init because the former depends
on the later to set up asic-specific init_doorbell_index
function

Signed-off-by: default avatarOak Zeng <ozeng@amd.com>
Suggested-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c93aa775

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+5 −3
Original line number Diff line number Diff line
@@ -513,6 +513,8 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev) 
 */

static int amdgpu_device_doorbell_init(struct amdgpu_device *adev)

{

	amdgpu_asic_init_doorbell_index(adev);



	/* No doorbell on SI hardware generation */

	if (adev->asic_type < CHIP_BONAIRE) {

		adev->doorbell.base = 0;
@@ -2464,9 +2466,6 @@ 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_device_doorbell_init(adev);



	/* io port mapping */

	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

		if (pci_resource_flags(adev->pdev, i) & IORESOURCE_IO) {
@@ -2485,6 +2484,9 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		return r;



	/* doorbell bar mapping and doorbell index init*/

	amdgpu_device_doorbell_init(adev);



	/* if we have > 1 VGA cards, then disable the amdgpu VGA resources */

	/* this will fail for cards that aren't VGA class devices, just

	 * ignore it */

CRA Git | Maintained and supported by SUSTech CRA and CCSE