Commit e222b36e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: fix AGP addressing when GART is not at 0 



This worked by luck if the GART aperture ended up at 0.  When
we ended up moving GART on some chips, the GART aperture ended
up offsetting the AGP address since the resource->start is
a GART offset, not an MC address.  Fix this by moving the AGP
address setup into amdgpu_bo_gpu_offset_no_check().

v2: check mem_type before checking agp
v3: check if the ttm bo has a ttm_tt allocated yet

Fixes: 67318cb8 ("drm/amdgpu/gmc11: set gart placement GC11")
Tested-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reported-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Reported-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: christian.koenig@amd.com
Cc: mario.limonciello@amd.com
parent c92da040

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

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ uint64_t amdgpu_gmc_agp_addr(struct ttm_buffer_object *bo) 
{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);



	if (!bo->ttm)

		return AMDGPU_BO_INVALID_OFFSET;



	if (bo->ttm->num_pages != 1 || bo->ttm->caching == ttm_cached)

		return AMDGPU_BO_INVALID_OFFSET;

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

+7 −3
Original line number Diff line number Diff line
@@ -1527,8 +1527,12 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo) 
u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	uint64_t offset;

	uint64_t offset = AMDGPU_BO_INVALID_OFFSET;



	if (bo->tbo.resource->mem_type == TTM_PL_TT)

		offset = amdgpu_gmc_agp_addr(&bo->tbo);



	if (offset == AMDGPU_BO_INVALID_OFFSET)

		offset = (bo->tbo.resource->start << PAGE_SHIFT) +

			amdgpu_ttm_domain_start(adev, bo->tbo.resource->mem_type);

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

+1 −3
Original line number Diff line number Diff line
@@ -959,10 +959,8 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) 
		return 0;



	addr = amdgpu_gmc_agp_addr(bo);

	if (addr != AMDGPU_BO_INVALID_OFFSET) {

		bo->resource->start = addr >> PAGE_SHIFT;

	if (addr != AMDGPU_BO_INVALID_OFFSET)

		return 0;

	}



	/* allocate GART space */

	placement.num_placement = 1;