Commit 2fcaca94 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: use register distance member instead of hardcode in UVD7/VCE4 



This patch updates to use register distance member instead of hardcode
in UVD7/VCE4. They are for the same ASIC.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Tested-by: default avatarAnZhong Huang <anzhong.huang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 228ea7b0

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

+3 −2
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, 
	pd_addr = amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pd_addr);



	/* wait for reg writes */

	data0 = hub->ctx0_ptb_addr_lo32 + vmid * 2;

	data0 = hub->ctx0_ptb_addr_lo32 + vmid * hub->ctx_addr_distance;

	data1 = lower_32_bits(pd_addr);

	mask = 0xffffffff;

	uvd_v7_0_ring_emit_reg_wait(ring, data0, data1, mask);
@@ -1417,7 +1417,8 @@ static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, 
	pd_addr = amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pd_addr);



	/* wait for reg writes */

	uvd_v7_0_enc_ring_emit_reg_wait(ring, hub->ctx0_ptb_addr_lo32 + vmid * 2,

	uvd_v7_0_enc_ring_emit_reg_wait(ring, hub->ctx0_ptb_addr_lo32 +

					vmid * hub->ctx_addr_distance,

					lower_32_bits(pd_addr), 0xffffffff);

}

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

+2 −1
Original line number Diff line number Diff line
@@ -991,7 +991,8 @@ static void vce_v4_0_emit_vm_flush(struct amdgpu_ring *ring, 
	pd_addr = amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pd_addr);



	/* wait for reg writes */

	vce_v4_0_emit_reg_wait(ring, hub->ctx0_ptb_addr_lo32 + vmid * 2,

	vce_v4_0_emit_reg_wait(ring, hub->ctx0_ptb_addr_lo32 +

			       vmid * hub->ctx_addr_distance,

			       lower_32_bits(pd_addr), 0xffffffff);

}