Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9be700e authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher
Browse files

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: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bd7d7acf

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, 
	ib->ptr[ib->length_dw++] = SDMA_PACKET(SDMA_OPCODE_GENERATE_PTE_PDE, 0, 0);

	ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */

	ib->ptr[ib->length_dw++] = upper_32_bits(pe);

	ib->ptr[ib->length_dw++] = flags; /* mask */

	ib->ptr[ib->length_dw++] = 0;

	ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */

	ib->ptr[ib->length_dw++] = upper_32_bits(flags);

	ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */

	ib->ptr[ib->length_dw++] = upper_32_bits(addr);

	ib->ptr[ib->length_dw++] = incr; /* increment size */

drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c

+2 −2
Original line number Diff line number Diff line
@@ -804,8 +804,8 @@ static void sdma_v2_4_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, 
	ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE);

	ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */

	ib->ptr[ib->length_dw++] = upper_32_bits(pe);

	ib->ptr[ib->length_dw++] = flags; /* mask */

	ib->ptr[ib->length_dw++] = 0;

	ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */

	ib->ptr[ib->length_dw++] = upper_32_bits(flags);

	ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */

	ib->ptr[ib->length_dw++] = upper_32_bits(addr);

	ib->ptr[ib->length_dw++] = incr; /* increment size */

drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c

+2 −2
Original line number Diff line number Diff line
@@ -1013,8 +1013,8 @@ static void sdma_v3_0_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, 
	ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_GEN_PTEPDE);

	ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */

	ib->ptr[ib->length_dw++] = upper_32_bits(pe);

	ib->ptr[ib->length_dw++] = flags; /* mask */

	ib->ptr[ib->length_dw++] = 0;

	ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */

	ib->ptr[ib->length_dw++] = upper_32_bits(flags);

	ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */

	ib->ptr[ib->length_dw++] = upper_32_bits(addr);

	ib->ptr[ib->length_dw++] = incr; /* increment size */

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

+2 −2
Original line number Diff line number Diff line
@@ -968,8 +968,8 @@ static void sdma_v4_0_vm_set_pte_pde(struct amdgpu_ib *ib, 
	ib->ptr[ib->length_dw++] = SDMA_PKT_HEADER_OP(SDMA_OP_PTEPDE);

	ib->ptr[ib->length_dw++] = lower_32_bits(pe); /* dst addr */

	ib->ptr[ib->length_dw++] = upper_32_bits(pe);

	ib->ptr[ib->length_dw++] = flags; /* mask */

	ib->ptr[ib->length_dw++] = 0;

	ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */

	ib->ptr[ib->length_dw++] = upper_32_bits(flags);

	ib->ptr[ib->length_dw++] = lower_32_bits(addr); /* value */

	ib->ptr[ib->length_dw++] = upper_32_bits(addr);

	ib->ptr[ib->length_dw++] = incr; /* increment size */

drivers/gpu/drm/amd/amdgpu/si_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -417,8 +417,8 @@ static void si_dma_vm_set_pte_pde(struct amdgpu_ib *ib, 
		ib->ptr[ib->length_dw++] = DMA_PTE_PDE_PACKET(ndw);

		ib->ptr[ib->length_dw++] = pe; /* dst addr */

		ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;

		ib->ptr[ib->length_dw++] = flags; /* mask */

		ib->ptr[ib->length_dw++] = 0;

		ib->ptr[ib->length_dw++] = lower_32_bits(flags); /* mask */

		ib->ptr[ib->length_dw++] = upper_32_bits(flags);

		ib->ptr[ib->length_dw++] = value; /* value */

		ib->ptr[ib->length_dw++] = upper_32_bits(value);

		ib->ptr[ib->length_dw++] = incr; /* increment size */