drm/amdgpu: revert "Add support for filling a buffer with 64 bit value"

This reverts commit 7bdc53f925af085ffa0580f10489f82b36cc2f1c and commit
330df03b3abf944f8f5180f2abc61367749984c0.

Neither are needed any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 8cf2e03f08f97983e9320ef4e4e5048cef57e870..a1f738170d3771a4f0a6d7f1ab12fb2451130b24 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -319,13 +319,6 @@ struct amdgpu_vm_pte_funcs {
        void (*write_pte)(struct amdgpu_ib *ib, uint64_t pe,
                          uint64_t value, unsigned count,
                          uint32_t incr);
-
-       /* maximum nums of PTEs/PDEs in a single operation */
-       uint32_t        set_max_nums_pte_pde;
-
-       /* number of dw to reserve per operation */
-       unsigned        set_pte_pde_num_dw;
-
        /* for linear pte/pde updates without addr mapping */
        void (*set_pte_pde)(struct amdgpu_ib *ib,
                            uint64_t pe,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d4339feb0bf42fe9cf820feb8a7a6897a678c318..a021de9629aded3de0885e6fc076c5c5d0f7e6ef 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1681,13 +1681,12 @@ error_free:
 }
 
 int amdgpu_fill_buffer(struct amdgpu_bo *bo,
-                      uint64_t src_data,
+                      uint32_t src_data,
                       struct reservation_object *resv,
                       struct dma_fence **fence)
 {
        struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
-       uint32_t max_bytes = 8 *
-                       adev->vm_manager.vm_pte_funcs->set_max_nums_pte_pde;
+       uint32_t max_bytes = adev->mman.buffer_funcs->fill_max_bytes;
        struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring;
 
        struct drm_mm_node *mm_node;
@@ -1718,9 +1717,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
                num_pages -= mm_node->size;
                ++mm_node;
        }
-
-       /* num of dwords for each SDMA_OP_PTEPDE cmd */
-       num_dw = num_loops * adev->vm_manager.vm_pte_funcs->set_pte_pde_num_dw;
+       num_dw = num_loops * adev->mman.buffer_funcs->fill_num_dw;
 
        /* for IB padding */
        num_dw += 64;
@@ -1745,16 +1742,12 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,
                uint32_t byte_count = mm_node->size << PAGE_SHIFT;
                uint64_t dst_addr;
 
-               WARN_ONCE(byte_count & 0x7, "size should be a multiple of 8");
-
                dst_addr = amdgpu_mm_node_addr(&bo->tbo, mm_node, &bo->tbo.mem);
                while (byte_count) {
                        uint32_t cur_size_in_bytes = min(byte_count, max_bytes);
 
-                       amdgpu_vm_set_pte_pde(adev, &job->ibs[0],
-                                       dst_addr, 0,
-                                       cur_size_in_bytes >> 3, 0,
-                                       src_data);
+                       amdgpu_emit_fill_buffer(adev, &job->ibs[0], src_data,
+                                               dst_addr, cur_size_in_bytes);
 
                        dst_addr += cur_size_in_bytes;
                        byte_count -= cur_size_in_bytes;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index 167856f6080fa432f23417f6e6117593d129ce59..1e275c7b006b066987528504df83155caa73cddc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -86,7 +86,7 @@ int amdgpu_ttm_copy_mem_to_mem(struct amdgpu_device *adev,
                               struct reservation_object *resv,
                               struct dma_fence **f);
 int amdgpu_fill_buffer(struct amdgpu_bo *bo,
-                       uint64_t src_data,
+                       uint32_t src_data,
                        struct reservation_object *resv,
                        struct dma_fence **fence);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index cecdb216abff90250c550a68dfeee34a9af377fc..e584c203c35700363d4ddc31043dd76883aa42eb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1242,11 +1242,10 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
 
        } else {
                /* set page commands needed */
-               ndw += ncmds * adev->vm_manager.vm_pte_funcs->set_pte_pde_num_dw;
+               ndw += ncmds * 10;
 
                /* extra commands for begin/end fragments */
-               ndw += 2 * adev->vm_manager.vm_pte_funcs->set_pte_pde_num_dw
-                               * adev->vm_manager.fragment_size;
+               ndw += 2 * 10 * adev->vm_manager.fragment_size;
 
                params.func = amdgpu_vm_do_set_ptes;
        }

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 5d18512cd090a785aebd24301052fa9ab59c036f..d78bf183488b998cf1072caeb0f59a93efcb80f8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -1382,9 +1382,6 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
        .copy_pte = cik_sdma_vm_copy_pte,
 
        .write_pte = cik_sdma_vm_write_pte,
-
-       .set_max_nums_pte_pde = 0x1fffff >> 3,
-       .set_pte_pde_num_dw = 10,
        .set_pte_pde = cik_sdma_vm_set_pte_pde,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 6a7a82a8c65d839ffb5218884b386eede539b1c7..792774eee909649c49e61609280b5618eeed1c06 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -1306,9 +1306,6 @@ static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {
        .copy_pte = sdma_v2_4_vm_copy_pte,
 
        .write_pte = sdma_v2_4_vm_write_pte,
-
-       .set_max_nums_pte_pde = 0x1fffff >> 3,
-       .set_pte_pde_num_dw = 10,
        .set_pte_pde = sdma_v2_4_vm_set_pte_pde,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 88178d81bd5a54cd11051a4a2abab5bc02cbcd53..83dde3b4c3ae2013d0989f675a36eb87e90be9b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -1739,10 +1739,6 @@ static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {
        .copy_pte = sdma_v3_0_vm_copy_pte,
 
        .write_pte = sdma_v3_0_vm_write_pte,
-
-       /* not 0x3fffff due to HW limitation */
-       .set_max_nums_pte_pde = 0x3fffe0 >> 3,
-       .set_pte_pde_num_dw = 10,
        .set_pte_pde = sdma_v3_0_vm_set_pte_pde,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index e9b1b834fee1dd2a97c702cfde6ab60704a1ad39..8505458d704193c47cfc0e082aa97c15bf875d96 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1686,9 +1686,6 @@ static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
        .copy_pte = sdma_v4_0_vm_copy_pte,
 
        .write_pte = sdma_v4_0_vm_write_pte,
-
-       .set_max_nums_pte_pde = 0x400000 >> 3,
-       .set_pte_pde_num_dw = 10,
        .set_pte_pde = sdma_v4_0_vm_set_pte_pde,
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
index e59521bacf0be0917c985ec0e028ba9b1db6287b..2db5bfba771e16edf091f82b4c345f54c653d31b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
@@ -875,9 +875,6 @@ static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
        .copy_pte = si_dma_vm_copy_pte,
 
        .write_pte = si_dma_vm_write_pte,
-
-       .set_max_nums_pte_pde = 0xffff8 >> 3,
-       .set_pte_pde_num_dw = 9,
        .set_pte_pde = si_dma_vm_set_pte_pde,
 };