drm/amdgpu/sdma4.0: adjust SDMA limits

SDMA 4.4.x has increased transfer limits.

v2: fix harder, use shifts to make it more obvious

Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>
Reviewed-by: Vitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index a35d9951e22a9329bc57a2b5234db88b2083dd26..44f0f23e11484384c1431ff0b4b002e02183c304 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -2604,18 +2604,31 @@ static void sdma_v4_0_emit_fill_buffer(struct amdgpu_ib *ib,
 }
 
 static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
-       .copy_max_bytes = 0x400000,
+       .copy_max_bytes = 1 << 22,
        .copy_num_dw = 7,
        .emit_copy_buffer = sdma_v4_0_emit_copy_buffer,
 
-       .fill_max_bytes = 0x400000,
+       .fill_max_bytes = 1 << 22,
+       .fill_num_dw = 5,
+       .emit_fill_buffer = sdma_v4_0_emit_fill_buffer,
+};
+
+static const struct amdgpu_buffer_funcs sdma_v4_4_buffer_funcs = {
+       .copy_max_bytes = 1 << 30,
+       .copy_num_dw = 7,
+       .emit_copy_buffer = sdma_v4_0_emit_copy_buffer,
+
+       .fill_max_bytes = 1 << 30,
        .fill_num_dw = 5,
        .emit_fill_buffer = sdma_v4_0_emit_fill_buffer,
 };
 
 static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
 {
-       adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
+       if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) >= IP_VERSION(4, 4, 0))
+               adev->mman.buffer_funcs = &sdma_v4_4_buffer_funcs;
+       else
+               adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
        if (adev->sdma.has_page_queue)
                adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].page;
        else