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

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

drm/amdgpu: don't init GDS pool if GDS size is 0 (v2) 

SI cards don't expose GDS as a separate pool.  The CP manages
GDS and the UMDs use special CP packets to allocate GDS memory.

v2: drop extra whitespace change

bug: https://bugzilla.kernel.org/show_bug.cgi?id=194867



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

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

+27 −18
Original line number Diff line number Diff line
@@ -1158,28 +1158,34 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	adev->gds.oa.gfx_partition_size = adev->gds.oa.gfx_partition_size << AMDGPU_OA_SHIFT;

	adev->gds.oa.cs_partition_size = adev->gds.oa.cs_partition_size << AMDGPU_OA_SHIFT;

	/* GDS Memory */

	if (adev->gds.mem.total_size) {

		r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_GDS,

				   adev->gds.mem.total_size >> PAGE_SHIFT);

		if (r) {

			DRM_ERROR("Failed initializing GDS heap.\n");

			return r;

		}

	}



	/* GWS */

	if (adev->gds.gws.total_size) {

		r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_GWS,

				   adev->gds.gws.total_size >> PAGE_SHIFT);

		if (r) {

			DRM_ERROR("Failed initializing gws heap.\n");

			return r;

		}

	}



	/* OA */

	if (adev->gds.oa.total_size) {

		r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_OA,

				   adev->gds.oa.total_size >> PAGE_SHIFT);

		if (r) {

			DRM_ERROR("Failed initializing oa heap.\n");

			return r;

		}

	}



	r = amdgpu_ttm_debugfs_init(adev);

	if (r) {
@@ -1206,8 +1212,11 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	}

	ttm_bo_clean_mm(&adev->mman.bdev, TTM_PL_VRAM);

	ttm_bo_clean_mm(&adev->mman.bdev, TTM_PL_TT);

	if (adev->gds.mem.total_size)

		ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_GDS);

	if (adev->gds.gws.total_size)

		ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_GWS);

	if (adev->gds.oa.total_size)

		ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_OA);

	ttm_bo_device_release(&adev->mman.bdev);

	amdgpu_gart_fini(adev);