Commit 9fd5543e authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: allow variable BO struct creation 



Allow allocating BO structures with different structure size
than struct amdgpu_bo.

v2: Check bo_ptr_size in all amdgpu_bo_create() caller.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 87cc7f9e

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

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size, 
	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	if (cp_mqd_gfx9)

		bp.flags |= AMDGPU_GEM_CREATE_CP_MQD_GFX9;
@@ -327,6 +328,7 @@ int amdgpu_amdkfd_alloc_gws(struct kgd_dev *kgd, size_t size, 
	bp.flags = AMDGPU_GEM_CREATE_NO_CPU_ACCESS;

	bp.type = ttm_bo_type_device;

	bp.resv = NULL;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r) {

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

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size, 
	bp.flags = 0;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	n = AMDGPU_BENCHMARK_ITERATIONS;

	r = amdgpu_bo_create(adev, &bp, &sobj);

	if (r) {

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

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) 
			AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

		bp.type = ttm_bo_type_kernel;

		bp.resv = NULL;

		bp.bo_ptr_size = sizeof(struct amdgpu_bo);



		r = amdgpu_bo_create(adev, &bp, &adev->gart.bo);

		if (r) {

			return r;

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

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 
	bp.preferred_domain = initial_domain;

	bp.flags = flags;

	bp.domain = initial_domain;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	r = amdgpu_bo_create(adev, &bp, &bo);

	if (r)

		return r;

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

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ int amdgpu_gmc_pdb0_alloc(struct amdgpu_device *adev) 
		AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;

	bp.bo_ptr_size = sizeof(struct amdgpu_bo);



	r = amdgpu_bo_create(adev, &bp, &adev->gmc.pdb0_bo);

	if (r)

		return r;