diff options
author | Christian König <christian.koenig@amd.com> | 2018-09-14 15:08:57 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-19 13:39:02 -0400 |
commit | fd395547924dad66dbe21c01e1a646f3215742ef (patch) | |
tree | c41e9587e2d0b1d7e7edcc86de04335c4ed00789 /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |
parent | c832c346cdf9022872655be621880e0f66f4135d (diff) |
drm/amdgpu: move reserving GDS/GWS/OA into common code
We don't need that in the per ASIC code.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index d83f4e265c5c..a44fc12ae1f9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | |||
@@ -1852,6 +1852,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) | |||
1852 | return r; | 1852 | return r; |
1853 | } | 1853 | } |
1854 | 1854 | ||
1855 | r = amdgpu_bo_create_kernel(adev, adev->gds.mem.gfx_partition_size, | ||
1856 | PAGE_SIZE, AMDGPU_GEM_DOMAIN_GDS, | ||
1857 | &adev->gds.gds_gfx_bo, NULL, NULL); | ||
1858 | if (r) | ||
1859 | return r; | ||
1860 | |||
1855 | r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_GWS, | 1861 | r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_GWS, |
1856 | adev->gds.gws.total_size); | 1862 | adev->gds.gws.total_size); |
1857 | if (r) { | 1863 | if (r) { |
@@ -1859,6 +1865,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) | |||
1859 | return r; | 1865 | return r; |
1860 | } | 1866 | } |
1861 | 1867 | ||
1868 | r = amdgpu_bo_create_kernel(adev, adev->gds.gws.gfx_partition_size, | ||
1869 | PAGE_SIZE, AMDGPU_GEM_DOMAIN_GWS, | ||
1870 | &adev->gds.gws_gfx_bo, NULL, NULL); | ||
1871 | if (r) | ||
1872 | return r; | ||
1873 | |||
1862 | r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_OA, | 1874 | r = ttm_bo_init_mm(&adev->mman.bdev, AMDGPU_PL_OA, |
1863 | adev->gds.oa.total_size); | 1875 | adev->gds.oa.total_size); |
1864 | if (r) { | 1876 | if (r) { |
@@ -1866,6 +1878,12 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) | |||
1866 | return r; | 1878 | return r; |
1867 | } | 1879 | } |
1868 | 1880 | ||
1881 | r = amdgpu_bo_create_kernel(adev, adev->gds.oa.gfx_partition_size, | ||
1882 | PAGE_SIZE, AMDGPU_GEM_DOMAIN_OA, | ||
1883 | &adev->gds.oa_gfx_bo, NULL, NULL); | ||
1884 | if (r) | ||
1885 | return r; | ||
1886 | |||
1869 | /* Register debugfs entries for amdgpu_ttm */ | 1887 | /* Register debugfs entries for amdgpu_ttm */ |
1870 | r = amdgpu_ttm_debugfs_init(adev); | 1888 | r = amdgpu_ttm_debugfs_init(adev); |
1871 | if (r) { | 1889 | if (r) { |