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

Commit 6ad86c31 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: remove HDP flushes from fence emit (v2) 



r600_ioctl_wait_idle() now handles this.

v2: update blit fence counts

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8e0d84a6

drivers/gpu/drm/radeon/r600.c

+0 −2
Original line number Diff line number Diff line
@@ -1804,8 +1804,6 @@ void r600_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(rdev, PACKET3(PACKET3_SET_CONFIG_REG, 1));

	radeon_ring_write(rdev, ((rdev->fence_drv.scratch_reg - PACKET3_SET_CONFIG_REG_OFFSET) >> 2));

	radeon_ring_write(rdev, fence->seq);

	radeon_ring_write(rdev, PACKET0(R_005480_HDP_MEM_COHERENCY_FLUSH_CNTL, 0));

	radeon_ring_write(rdev, 1);

	/* CP_INTERRUPT packet 3 no longer exists, use packet 0 */

	radeon_ring_write(rdev, PACKET0(CP_INT_STATUS, 0));

	radeon_ring_write(rdev, RB_INT_STAT);

drivers/gpu/drm/radeon/r600_blit_kms.c

+2 −2
Original line number Diff line number Diff line
@@ -576,9 +576,9 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes) 
	ring_size = num_loops * dwords_per_loop;

	/* set default  + shaders */

	ring_size += 40; /* shaders + def state */

	ring_size += 12; /* fence emit for VB IB */

	ring_size += 10; /* fence emit for VB IB */

	ring_size += 5; /* done copy */

	ring_size += 12; /* fence emit for done copy */

	ring_size += 10; /* fence emit for done copy */

	r = radeon_ring_lock(rdev, ring_size);

	if (r)

		return r;