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

Commit fd395547 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move reserving GDS/GWS/OA into common code 



We don't need that in the per ASIC code.

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

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

+18 −0
Original line number Diff line number Diff line
@@ -1852,6 +1852,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		return r;

	}



	r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,

				    &adev->gds.gds_gfx_bo, NULL, NULL);

	if (r)

		return r;



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

			   adev->gds.gws.total_size);

	if (r) {
@@ -1859,6 +1865,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		return r;

	}



	r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,

				    &adev->gds.gws_gfx_bo, NULL, NULL);

	if (r)

		return r;



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

			   adev->gds.oa.total_size);

	if (r) {
@@ -1866,6 +1878,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
		return r;

	}



	r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,

				    &adev->gds.oa_gfx_bo, NULL, NULL);

	if (r)

		return r;



	/* Register debugfs entries for amdgpu_ttm */

	r = amdgpu_ttm_debugfs_init(adev);

	if (r) {

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

+0 −19
Original line number Diff line number Diff line
@@ -4582,25 +4582,6 @@ static int gfx_v7_0_sw_init(void *handle) 
		}

	}



	/* reserve GDS, GWS and OA resource for gfx */

	r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,

				    &adev->gds.gds_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,

				    &adev->gds.gws_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,

				    &adev->gds.oa_gfx_bo, NULL, NULL);

	if (r)

		return r;



	adev->gfx.ce_ram_size = 0x8000;



	gfx_v7_0_gpu_early_init(adev);

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

+0 −19
Original line number Diff line number Diff line
@@ -2161,25 +2161,6 @@ static int gfx_v8_0_sw_init(void *handle) 
	if (r)

		return r;



	/* reserve GDS, GWS and OA resource for gfx */

	r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,

				    &adev->gds.gds_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,

				    &adev->gds.gws_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,

				    &adev->gds.oa_gfx_bo, NULL, NULL);

	if (r)

		return r;



	adev->gfx.ce_ram_size = 0x8000;



	r = gfx_v8_0_gpu_early_init(adev);

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

+0 −19
Original line number Diff line number Diff line
@@ -1700,25 +1700,6 @@ static int gfx_v9_0_sw_init(void *handle) 
	if (r)

		return r;



	/* reserve GDS, GWS and OA resource for gfx */

	r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS,

				    &adev->gds.gds_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS,

				    &adev->gds.gws_gfx_bo, NULL, NULL);

	if (r)

		return r;



	r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size,

				    PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA,

				    &adev->gds.oa_gfx_bo, NULL, NULL);

	if (r)

		return r;



	adev->gfx.ce_ram_size = 0x8000;



	r = gfx_v9_0_gpu_early_init(adev);