tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amdgpu: fix vm pte pde flags to 64-bit for sdma (v3)

v2: fix for all sdma engines
v3: squash in fix for SI/CI

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-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>

authored by

Junwei Zhang and committed by
Alex Deucher b9be700e bd7d7acf

+10 -10
+2 -2
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
··· 755 755 ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_GENERATE_PTE_PDE, 0, 0); 756 756 ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */ 757 757 ib->ptr[ib->length_dw++] = upper_32_bits(pe); 758 - ib->ptr[ib->length_dw++] = flags; /* mask */ 759 - ib->ptr[ib->length_dw++] = 0; 758 + ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */ 759 + ib->ptr[ib->length_dw++] = upper_32_bits(flags); 760 760 ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */ 761 761 ib->ptr[ib->length_dw++] = upper_32_bits(addr); 762 762 ib->ptr[ib->length_dw++] = incr; /* increment size */
+2 -2
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
··· 804 804 ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE); 805 805 ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */ 806 806 ib->ptr[ib->length_dw++] = upper_32_bits(pe); 807 - ib->ptr[ib->length_dw++] = flags; /* mask */ 808 - ib->ptr[ib->length_dw++] = 0; 807 + ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */ 808 + ib->ptr[ib->length_dw++] = upper_32_bits(flags); 809 809 ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */ 810 810 ib->ptr[ib->length_dw++] = upper_32_bits(addr); 811 811 ib->ptr[ib->length_dw++] = incr; /* increment size */
+2 -2
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
··· 1013 1013 ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE); 1014 1014 ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */ 1015 1015 ib->ptr[ib->length_dw++] = upper_32_bits(pe); 1016 - ib->ptr[ib->length_dw++] = flags; /* mask */ 1017 - ib->ptr[ib->length_dw++] = 0; 1016 + ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */ 1017 + ib->ptr[ib->length_dw++] = upper_32_bits(flags); 1018 1018 ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */ 1019 1019 ib->ptr[ib->length_dw++] = upper_32_bits(addr); 1020 1020 ib->ptr[ib->length_dw++] = incr; /* increment size */
+2 -2
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 968 968 ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_PTEPDE); 969 969 ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */ 970 970 ib->ptr[ib->length_dw++] = upper_32_bits(pe); 971 - ib->ptr[ib->length_dw++] = flags; /* mask */ 972 - ib->ptr[ib->length_dw++] = 0; 971 + ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */ 972 + ib->ptr[ib->length_dw++] = upper_32_bits(flags); 973 973 ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */ 974 974 ib->ptr[ib->length_dw++] = upper_32_bits(addr); 975 975 ib->ptr[ib->length_dw++] = incr; /* increment size */
+2 -2
drivers/gpu/drm/amd/amdgpu/si_dma.c
··· 417 417 ib->ptr[ib->length_dw++] = DMA_PTE_PDE_PACKET(ndw); 418 418 ib->ptr[ib->length_dw++] = pe; /* dst addr */ 419 419 ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff; 420 - ib->ptr[ib->length_dw++] = flags; /* mask */ 421 - ib->ptr[ib->length_dw++] = 0; 420 + ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */ 421 + ib->ptr[ib->length_dw++] = upper_32_bits(flags); 422 422 ib->ptr[ib->length_dw++] = value; /* value */ 423 423 ib->ptr[ib->length_dw++] = upper_32_bits(value); 424 424 ib->ptr[ib->length_dw++] = incr; /* increment size */