Commit 4b98e0c4 authored by Alex Xie's avatar Alex Xie Committed by Alex Deucher
Browse files

drm/amdgpu: set GART PTE asic specific flags 



Set asic specific gart pte flags in the gmc IP module for
each asic.

Signed-off-by: default avatarAlex Xie <AlexBin.Xie@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent daf42c31

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −0
Original line number Diff line number Diff line
@@ -524,6 +524,10 @@ struct amdgpu_gart { 
	struct page			**pages;

#endif

	bool				ready;



	/* Asic default pte flags */

	uint64_t			gart_pte_flags;



	const struct amdgpu_gart_funcs *gart_funcs;

};

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

+1 −3
Original line number Diff line number Diff line
@@ -1042,9 +1042,7 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, 
			flags |= AMDGPU_PTE_SNOOPED;

	}



	if (adev->asic_type >= CHIP_TONGA)

		flags |= AMDGPU_PTE_EXECUTABLE;



	flags |= adev->gart.gart_pte_flags;

	flags |= AMDGPU_PTE_READABLE;



	if (!amdgpu_ttm_tt_is_readonly(ttm))

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

+1 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static int gmc_v6_0_gart_init(struct amdgpu_device *adev) 
	if (r)

		return r;

	adev->gart.table_size = adev->gart.num_gpu_pages * 8;

	adev->gart.gart_pte_flags = 0;

	return amdgpu_gart_table_vram_alloc(adev);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ static int gmc_v7_0_gart_init(struct amdgpu_device *adev) 
	if (r)

		return r;

	adev->gart.table_size = adev->gart.num_gpu_pages * 8;

	adev->gart.gart_pte_flags = 0;

	return amdgpu_gart_table_vram_alloc(adev);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev) 
	if (r)

		return r;

	adev->gart.table_size = adev->gart.num_gpu_pages * 8;

	adev->gart.gart_pte_flags = AMDGPU_PTE_EXECUTABLE;

	return amdgpu_gart_table_vram_alloc(adev);

}