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

Commit 7465280c authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: add support for multiple fence queues v2 



For supporting multiple CP ring buffers, async DMA
engines and UVD.  We still need a way to synchronize
between engines.

v2 initialize unused fence driver ring to avoid issue in
   suspend/unload

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 851a6bd9

drivers/gpu/drm/radeon/evergreen.c

+3 −3
Original line number Diff line number Diff line
@@ -3018,11 +3018,11 @@ restart_ih: 
		case 177: /* CP_INT in IB1 */

		case 178: /* CP_INT in IB2 */

			DRM_DEBUG("IH: CP int: 0x%08x\n", src_data);

			radeon_fence_process(rdev);

			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);

			break;

		case 181: /* CP EOP event */

			DRM_DEBUG("IH: CP EOP\n");

			radeon_fence_process(rdev);

			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);

			break;

		case 233: /* GUI IDLE */

			DRM_DEBUG("IH: GUI idle\n");
@@ -3221,7 +3221,7 @@ int evergreen_init(struct radeon_device *rdev) 
	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	r = radeon_fence_driver_init(rdev, 1);

	if (r)

		return r;

	/* initialize AGP */

drivers/gpu/drm/radeon/ni.c

+1 −1
Original line number Diff line number Diff line
@@ -1484,7 +1484,7 @@ int cayman_init(struct radeon_device *rdev) 
	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	r = radeon_fence_driver_init(rdev, 3);

	if (r)

		return r;

	/* initialize memory controller */

drivers/gpu/drm/radeon/r100.c

+3 −3
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ int r100_irq_process(struct radeon_device *rdev) 
	while (status) {

		/* SW interrupt */

		if (status & RADEON_SW_INT_TEST) {

			radeon_fence_process(rdev);

			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);

		}

		/* gui idle interrupt */

		if (status & RADEON_GUI_IDLE_STAT) {
@@ -826,7 +826,7 @@ void r100_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));

	radeon_ring_write(rdev, rdev->config.r100.hdp_cntl);

	/* Emit fence sequence & fire IRQ */

	radeon_ring_write(rdev, PACKET0(rdev->fence_drv.scratch_reg, 0));

	radeon_ring_write(rdev, PACKET0(rdev->fence_drv[fence->ring].scratch_reg, 0));

	radeon_ring_write(rdev, fence->seq);

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

	radeon_ring_write(rdev, RADEON_SW_INT_FIRE);
@@ -4048,7 +4048,7 @@ int r100_init(struct radeon_device *rdev) 
	/* initialize VRAM */

	r100_mc_init(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	r = radeon_fence_driver_init(rdev, 1);

	if (r)

		return r;

	r = radeon_irq_kms_init(rdev);

drivers/gpu/drm/radeon/r300.c

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void r300_fence_ring_emit(struct radeon_device *rdev, 
	radeon_ring_write(rdev, PACKET0(RADEON_HOST_PATH_CNTL, 0));

	radeon_ring_write(rdev, rdev->config.r300.hdp_cntl);

	/* Emit fence sequence & fire IRQ */

	radeon_ring_write(rdev, PACKET0(rdev->fence_drv.scratch_reg, 0));

	radeon_ring_write(rdev, PACKET0(rdev->fence_drv[fence->ring].scratch_reg, 0));

	radeon_ring_write(rdev, fence->seq);

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

	radeon_ring_write(rdev, RADEON_SW_INT_FIRE);
@@ -1518,7 +1518,7 @@ int r300_init(struct radeon_device *rdev) 
	/* initialize memory controller */

	r300_mc_init(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	r = radeon_fence_driver_init(rdev, 1);

	if (r)

		return r;

	r = radeon_irq_kms_init(rdev);

drivers/gpu/drm/radeon/r420.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ int r420_init(struct radeon_device *rdev) 
	r300_mc_init(rdev);

	r420_debugfs(rdev);

	/* Fence driver */

	r = radeon_fence_driver_init(rdev);

	r = radeon_fence_driver_init(rdev, 1);

	if (r) {

		return r;

	}