Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf4de5a authored by Tormod Volden's avatar Tormod Volden Committed by Dave Airlie
Browse files

drm/radeon: Print gart initialization details on all chipsets 



This was previously done for r300 only. Use %016llX instead of %08X for
printing the table address.

Also fix typos in gart warning messages.

Signed-off-by: default avatarTormod Volden <debian.tormod@gmail.com>
Reviewed-by: default avatarMichel Dänzer <michel@daenzer.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 2ae7b03c

drivers/gpu/drm/radeon/evergreen.c

+3 −0
Original line number Diff line number Diff line
@@ -910,6 +910,9 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev) 
	WREG32(VM_CONTEXT1_CNTL, 0);



	evergreen_pcie_gart_tlb_flush(rdev);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20),

		 (unsigned long long)rdev->gart.table_addr);

	rdev->gart.ready = true;

	return 0;

}

drivers/gpu/drm/radeon/ni.c

+3 −0
Original line number Diff line number Diff line
@@ -996,6 +996,9 @@ int cayman_pcie_gart_enable(struct radeon_device *rdev) 
	WREG32(VM_CONTEXT1_CNTL, 0);



	cayman_pcie_gart_tlb_flush(rdev);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20),

		 (unsigned long long)rdev->gart.table_addr);

	rdev->gart.ready = true;

	return 0;

}

drivers/gpu/drm/radeon/r100.c

+3 −0
Original line number Diff line number Diff line
@@ -513,6 +513,9 @@ int r100_pci_gart_enable(struct radeon_device *rdev) 
	tmp = RREG32(RADEON_AIC_CNTL) | RADEON_PCIGART_TRANSLATE_EN;

	WREG32(RADEON_AIC_CNTL, tmp);

	r100_pci_gart_tlb_flush(rdev);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20),

		 (unsigned long long)rdev->gart.table_addr);

	rdev->gart.ready = true;

	return 0;

}

drivers/gpu/drm/radeon/r300.c

+3 −2
Original line number Diff line number Diff line
@@ -144,8 +144,9 @@ int rv370_pcie_gart_enable(struct radeon_device *rdev) 
	tmp |= RADEON_PCIE_TX_GART_UNMAPPED_ACCESS_DISCARD;

	WREG32_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);

	rv370_pcie_gart_tlb_flush(rdev);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%08X).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20), table_addr);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20),

		 (unsigned long long)table_addr);

	rdev->gart.ready = true;

	return 0;

}

drivers/gpu/drm/radeon/r600.c

+3 −0
Original line number Diff line number Diff line
@@ -993,6 +993,9 @@ int r600_pcie_gart_enable(struct radeon_device *rdev) 
		WREG32(VM_CONTEXT0_CNTL + (i * 4), 0);



	r600_pcie_gart_tlb_flush(rdev);

	DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",

		 (unsigned)(rdev->mc.gtt_size >> 20),

		 (unsigned long long)rdev->gart.table_addr);

	rdev->gart.ready = true;

	return 0;

}