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

Commit 15d3332f authored by Christian König's avatar Christian König Committed by Dave Airlie
Browse files

drm/radeon/kms: add support for semaphores v3 



They are used to sync between rings, while fences
sync between a ring and the cpu.

v2 Fix radeon_semaphore_driver_fini when no semaphore were
allocated.

v3 Initialize list early on to avoid issue in case or early
error

Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7465280c

drivers/gpu/drm/radeon/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	r200.o radeon_legacy_tv.o r600_cs.o r600_blit.o r600_blit_shaders.o \

	r600_blit_kms.o radeon_pm.o atombios_dp.o r600_audio.o r600_hdmi.o \

	evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \

	radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o

	radeon_trace_points.o ni.o cayman_blit_shaders.o atombios_encoders.o \

	radeon_semaphore.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o

drivers/gpu/drm/radeon/evergreen.c

+2 −1
Original line number Diff line number Diff line
@@ -1448,7 +1448,7 @@ int evergreen_cp_resume(struct radeon_device *rdev) 
	tmp |= BUF_SWAP_32BIT;

#endif

	WREG32(CP_RB_CNTL, tmp);

	WREG32(CP_SEM_WAIT_TIMER, 0x4);

	WREG32(CP_SEM_WAIT_TIMER, 0x0);



	/* Set the write pointer delay */

	WREG32(CP_RB_WPTR_DELAY, 0);
@@ -3290,6 +3290,7 @@ void evergreen_fini(struct radeon_device *rdev) 
	evergreen_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_semaphore_driver_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_agp_fini(rdev);

	radeon_bo_fini(rdev);

drivers/gpu/drm/radeon/ni.c

+2 −1
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ int cayman_cp_resume(struct radeon_device *rdev) 
	WREG32(GRBM_SOFT_RESET, 0);

	RREG32(GRBM_SOFT_RESET);



	WREG32(CP_SEM_WAIT_TIMER, 0x4);

	WREG32(CP_SEM_WAIT_TIMER, 0x0);



	/* Set the write pointer delay */

	WREG32(CP_RB_WPTR_DELAY, 0);
@@ -1557,6 +1557,7 @@ void cayman_fini(struct radeon_device *rdev) 
	cayman_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_semaphore_driver_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_bo_fini(rdev);

	radeon_atombios_fini(rdev);

drivers/gpu/drm/radeon/r100.c

+8 −0
Original line number Diff line number Diff line
@@ -832,6 +832,14 @@ void r100_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(rdev, RADEON_SW_INT_FIRE);

}



void r100_semaphore_ring_emit(struct radeon_device *rdev,

			      struct radeon_semaphore *semaphore,

			      unsigned ring, bool emit_wait)

{

	/* Unused on older asics, since we don't have semaphores or multiple rings */

	BUG();

}



int r100_copy_blit(struct radeon_device *rdev,

		   uint64_t src_offset,

		   uint64_t dst_offset,

drivers/gpu/drm/radeon/r600.c

+14 −1
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ int r600_cp_resume(struct radeon_device *rdev) 
	tmp |= BUF_SWAP_32BIT;

#endif

	WREG32(CP_RB_CNTL, tmp);

	WREG32(CP_SEM_WAIT_TIMER, 0x4);

	WREG32(CP_SEM_WAIT_TIMER, 0x0);



	/* Set the write pointer delay */

	WREG32(CP_RB_WPTR_DELAY, 0);
@@ -2357,6 +2357,18 @@ void r600_fence_ring_emit(struct radeon_device *rdev, 
	}

}



void r600_semaphore_ring_emit(struct radeon_device *rdev,

			      struct radeon_semaphore *semaphore,

			      unsigned ring, bool emit_wait)

{

	uint64_t addr = semaphore->gpu_addr;

	unsigned sel = emit_wait ? PACKET3_SEM_SEL_WAIT : PACKET3_SEM_SEL_SIGNAL;



	radeon_ring_write(rdev, PACKET3(PACKET3_MEM_SEMAPHORE, 1));

	radeon_ring_write(rdev, addr & 0xffffffff);

	radeon_ring_write(rdev, (upper_32_bits(addr) & 0xff) | sel);

}



int r600_copy_blit(struct radeon_device *rdev,

		   uint64_t src_offset,

		   uint64_t dst_offset,
@@ -2649,6 +2661,7 @@ void r600_fini(struct radeon_device *rdev) 
	r600_vram_scratch_fini(rdev);

	radeon_agp_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_semaphore_driver_fini(rdev);

	radeon_fence_driver_fini(rdev);

	radeon_bo_fini(rdev);

	radeon_atombios_fini(rdev);