4 files changed, 18 insertions, 57 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)
                 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) {
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index c0f9732cbaf7..fc39ebbc9d9f 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 96df23c99cfb..470dc80f4fe7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 528a8a567633..f369d9603435 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -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);