Commit 30eb77f4 authored by Jerome Glisse's avatar Jerome Glisse Committed by Dave Airlie
Browse files

drm/radeon: precompute fence cpu/gpu addr once v3 



Add a start fence driver helper function which will be call
once for each ring and will compute cpu/gpu addr for fence
depending on wether to use wb buffer or scratch reg.

This patch replace initialize fence driver separately which
was broken in regard of GPU lockup. The fence list for created,
emited, signaled must be initialize once and only from the
asic init callback not from the startup call back which is
call from the gpu reset.

v2: With this in place we no longer need to know the number of
    rings in fence_driver_init, also writing to the scratch reg
    before knowing its offset is a bad idea.

v3: rebase on top of change to previous patch in the serie

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 af9720f4

drivers/gpu/drm/radeon/evergreen.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -3111,6 +3111,12 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	/* Enable IRQ */

	/* Enable IRQ */

	r = r600_irq_init(rdev);

	r = r600_irq_init(rdev);

	if (r) {

	if (r) {
@@ -3229,7 +3235,7 @@ int evergreen_init(struct radeon_device *rdev) 
	/* Initialize clocks */

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	radeon_get_clock_info(rdev->ddev);

	/* Fence driver */

	/* Fence driver */

	r = radeon_fence_driver_init(rdev, 1);

	r = radeon_fence_driver_init(rdev);

	if (r)

	if (r)

		return r;

		return r;

	/* initialize AGP */

	/* initialize AGP */

drivers/gpu/drm/radeon/ni.c

+19 −1
Original line number Original line Diff line number Diff line
@@ -1384,6 +1384,24 @@ static int cayman_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_CP1_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	r = radeon_fence_driver_start_ring(rdev, CAYMAN_RING_TYPE_CP2_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	/* Enable IRQ */

	/* Enable IRQ */

	r = r600_irq_init(rdev);

	r = r600_irq_init(rdev);

	if (r) {

	if (r) {
@@ -1492,7 +1510,7 @@ int cayman_init(struct radeon_device *rdev) 
	/* Initialize clocks */

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	radeon_get_clock_info(rdev->ddev);

	/* Fence driver */

	/* Fence driver */

	r = radeon_fence_driver_init(rdev, 3);

	r = radeon_fence_driver_init(rdev);

	if (r)

	if (r)

		return r;

		return r;

	/* initialize memory controller */

	/* initialize memory controller */

drivers/gpu/drm/radeon/r100.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -3916,6 +3916,12 @@ static int r100_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	/* Enable IRQ */

	/* Enable IRQ */

	r100_irq_set(rdev);

	r100_irq_set(rdev);

	rdev->config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);

	rdev->config.r100.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
@@ -4059,7 +4065,7 @@ int r100_init(struct radeon_device *rdev) 
	/* initialize VRAM */

	/* initialize VRAM */

	r100_mc_init(rdev);

	r100_mc_init(rdev);

	/* Fence driver */

	/* Fence driver */

	r = radeon_fence_driver_init(rdev, 1);

	r = radeon_fence_driver_init(rdev);

	if (r)

	if (r)

		return r;

		return r;

	r = radeon_irq_kms_init(rdev);

	r = radeon_irq_kms_init(rdev);

drivers/gpu/drm/radeon/r300.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -1399,6 +1399,12 @@ static int r300_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	/* Enable IRQ */

	/* Enable IRQ */

	r100_irq_set(rdev);

	r100_irq_set(rdev);

	rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);

	rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
@@ -1521,7 +1527,7 @@ int r300_init(struct radeon_device *rdev) 
	/* initialize memory controller */

	/* initialize memory controller */

	r300_mc_init(rdev);

	r300_mc_init(rdev);

	/* Fence driver */

	/* Fence driver */

	r = radeon_fence_driver_init(rdev, 1);

	r = radeon_fence_driver_init(rdev);

	if (r)

	if (r)

		return r;

		return r;

	r = radeon_irq_kms_init(rdev);

	r = radeon_irq_kms_init(rdev);

drivers/gpu/drm/radeon/r420.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -258,6 +258,12 @@ static int r420_startup(struct radeon_device *rdev) 
	if (r)

	if (r)

		return r;

		return r;





	r = radeon_fence_driver_start_ring(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		dev_err(rdev->dev, "failed initializing CP fences (%d).\n", r);

		return r;

	}



	/* Enable IRQ */

	/* Enable IRQ */

	r100_irq_set(rdev);

	r100_irq_set(rdev);

	rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);

	rdev->config.r300.hdp_cntl = RREG32(RADEON_HOST_PATH_CNTL);
@@ -391,7 +397,7 @@ int r420_init(struct radeon_device *rdev) 
	r300_mc_init(rdev);

	r300_mc_init(rdev);

	r420_debugfs(rdev);

	r420_debugfs(rdev);

	/* Fence driver */

	/* Fence driver */

	r = radeon_fence_driver_init(rdev, 1);

	r = radeon_fence_driver_init(rdev);

	if (r) {

	if (r) {

		return r;

		return r;

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE