drm/amdgpu: update ib_start/size_alignment same as windows used

PAGE_SIZE for start_alignment is far much than hw requirement,
And now, update to expereince value from window side.

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index ec1060a5eab3acfd33b59b9cd055a5228bbf285d..2060f208e60b77c461df1a9a529b5f48cfaa7937 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -329,35 +329,35 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                        type = AMD_IP_BLOCK_TYPE_GFX;
                        for (i = 0; i < adev->gfx.num_gfx_rings; i++)
                                ring_mask |= ((adev->gfx.gfx_ring[i].ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
-                       ib_size_alignment = 8;
+                       ib_start_alignment = 32;
+                       ib_size_alignment = 32;
                        break;
                case AMDGPU_HW_IP_COMPUTE:
                        type = AMD_IP_BLOCK_TYPE_GFX;
                        for (i = 0; i < adev->gfx.num_compute_rings; i++)
                                ring_mask |= ((adev->gfx.compute_ring[i].ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
-                       ib_size_alignment = 8;
+                       ib_start_alignment = 32;
+                       ib_size_alignment = 32;
                        break;
                case AMDGPU_HW_IP_DMA:
                        type = AMD_IP_BLOCK_TYPE_SDMA;
                        for (i = 0; i < adev->sdma.num_instances; i++)
                                ring_mask |= ((adev->sdma.instance[i].ring.ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
-                       ib_size_alignment = 1;
+                       ib_start_alignment = 256;
+                       ib_size_alignment = 4;
                        break;
                case AMDGPU_HW_IP_UVD:
                        type = AMD_IP_BLOCK_TYPE_UVD;
                        for (i = 0; i < adev->uvd.num_uvd_inst; i++)
                                ring_mask |= ((adev->uvd.inst[i].ring.ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
-                       ib_size_alignment = 16;
+                       ib_start_alignment = 64;
+                       ib_size_alignment = 64;
                        break;
                case AMDGPU_HW_IP_VCE:
                        type = AMD_IP_BLOCK_TYPE_VCE;
                        for (i = 0; i < adev->vce.num_rings; i++)
                                ring_mask |= ((adev->vce.ring[i].ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
+                       ib_start_alignment = 4;
                        ib_size_alignment = 1;
                        break;
                case AMDGPU_HW_IP_UVD_ENC:
@@ -367,26 +367,26 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                                        ring_mask |=
                                        ((adev->uvd.inst[i].ring_enc[j].ready ? 1 : 0) <<
                                        (j + i * adev->uvd.num_enc_rings));
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
-                       ib_size_alignment = 1;
+                       ib_start_alignment = 64;
+                       ib_size_alignment = 64;
                        break;
                case AMDGPU_HW_IP_VCN_DEC:
                        type = AMD_IP_BLOCK_TYPE_VCN;
                        ring_mask = adev->vcn.ring_dec.ready ? 1 : 0;
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
+                       ib_start_alignment = 16;
                        ib_size_alignment = 16;
                        break;
                case AMDGPU_HW_IP_VCN_ENC:
                        type = AMD_IP_BLOCK_TYPE_VCN;
                        for (i = 0; i < adev->vcn.num_enc_rings; i++)
                                ring_mask |= ((adev->vcn.ring_enc[i].ready ? 1 : 0) << i);
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
+                       ib_start_alignment = 64;
                        ib_size_alignment = 1;
                        break;
                case AMDGPU_HW_IP_VCN_JPEG:
                        type = AMD_IP_BLOCK_TYPE_VCN;
                        ring_mask = adev->vcn.ring_jpeg.ready ? 1 : 0;
-                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
+                       ib_start_alignment = 16;
                        ib_size_alignment = 16;
                        break;
                default: