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

drm/radeon: introduce a sub allocator and convert ib pool to it v4 



Somewhat specializaed sub-allocator designed to perform sub-allocation
for command buffer not only for current cs ioctl but for future command
submission ioctl as well. Patch also convert current ib pool to use
the sub allocator. Idea is that ib poll buffer can be share with other
command buffer submission not having 64K granularity.

v2 Harmonize pool handling and add suspend/resume callback to pin/unpin
sa bo (tested on rv280, rv370, r420, rv515, rv610, rv710, redwood, cayman,
rs480, rs690, rs880)
v3 Simplify allocator
v4 Fix radeon_ib_get error path to properly free fence

Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1b37078b

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.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_semaphore.o

	radeon_semaphore.o radeon_sa.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o

drivers/gpu/drm/radeon/evergreen.c

+22 −20
Original line number Diff line number Diff line
@@ -3182,6 +3182,17 @@ static int evergreen_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_start(rdev);

	if (r)

		return r;



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		rdev->accel_working = false;

		return r;

	}



	return 0;

}
@@ -3201,18 +3212,13 @@ int evergreen_resume(struct radeon_device *rdev) 
	/* post card */

	atom_asic_init(rdev->mode_info.atom_context);



	rdev->accel_working = true;

	r = evergreen_startup(rdev);

	if (r) {

		DRM_ERROR("evergreen startup failed on resume\n");

		return r;

	}



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		return r;

	}



	return r;



}
@@ -3222,12 +3228,13 @@ int evergreen_suspend(struct radeon_device *rdev) 
	struct radeon_ring *ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];



	/* FIXME: we should wait for ring to be empty */

	radeon_ib_pool_suspend(rdev);

	r600_blit_suspend(rdev);

	r700_cp_stop(rdev);

	ring->ready = false;

	evergreen_irq_suspend(rdev);

	radeon_wb_disable(rdev);

	evergreen_pcie_gart_disable(rdev);

	r600_blit_suspend(rdev);



	return 0;

}
@@ -3312,29 +3319,24 @@ int evergreen_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

		dev_err(rdev->dev, "IB initialization failed (%d).\n", r);

		rdev->accel_working = false;

	}



	r = evergreen_startup(rdev);

	if (r) {

		dev_err(rdev->dev, "disabling GPU acceleration\n");

		r700_cp_fini(rdev);

		r600_irq_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		evergreen_pcie_gart_fini(rdev);

		rdev->accel_working = false;

	}

	if (rdev->accel_working) {

		r = radeon_ib_pool_init(rdev);

		if (r) {

			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);

			rdev->accel_working = false;

		}

		r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

		if (r) {

			DRM_ERROR("radeon: failed testing IB (%d).\n", r);

			rdev->accel_working = false;

		}

	}

	return 0;

}
@@ -3344,7 +3346,7 @@ void evergreen_fini(struct radeon_device *rdev) 
	r700_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	r100_ib_fini(rdev);

	radeon_irq_kms_fini(rdev);

	evergreen_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

drivers/gpu/drm/radeon/ni.c

+22 −23
Original line number Diff line number Diff line
@@ -1453,6 +1453,17 @@ static int cayman_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_start(rdev);

	if (r)

		return r;



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		DRM_ERROR("radeon: failed testing IB (%d).\n", r);

		rdev->accel_working = false;

		return r;

	}



	return 0;

}
@@ -1467,32 +1478,25 @@ int cayman_resume(struct radeon_device *rdev) 
	/* post card */

	atom_asic_init(rdev->mode_info.atom_context);



	rdev->accel_working = true;

	r = cayman_startup(rdev);

	if (r) {

		DRM_ERROR("cayman startup failed on resume\n");

		return r;

	}



	r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

	if (r) {

		DRM_ERROR("radeon: failled testing IB (%d).\n", r);

	return r;

}



	return r;



}



int cayman_suspend(struct radeon_device *rdev)

{

	/* FIXME: we should wait for ring to be empty */

	radeon_ib_pool_suspend(rdev);

	r600_blit_suspend(rdev);

	cayman_cp_enable(rdev, false);

	rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready = false;

	evergreen_irq_suspend(rdev);

	radeon_wb_disable(rdev);

	cayman_pcie_gart_disable(rdev);

	r600_blit_suspend(rdev);



	return 0;

}
@@ -1567,29 +1571,24 @@ int cayman_init(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

		dev_err(rdev->dev, "IB initialization failed (%d).\n", r);

		rdev->accel_working = false;

	}



	r = cayman_startup(rdev);

	if (r) {

		dev_err(rdev->dev, "disabling GPU acceleration\n");

		cayman_cp_fini(rdev);

		r600_irq_fini(rdev);

		radeon_wb_fini(rdev);

		r100_ib_fini(rdev);

		radeon_irq_kms_fini(rdev);

		cayman_pcie_gart_fini(rdev);

		rdev->accel_working = false;

	}

	if (rdev->accel_working) {

		r = radeon_ib_pool_init(rdev);

		if (r) {

			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);

			rdev->accel_working = false;

		}

		r = r600_ib_test(rdev, RADEON_RING_TYPE_GFX_INDEX);

		if (r) {

			DRM_ERROR("radeon: failed testing IB (%d).\n", r);

			rdev->accel_working = false;

		}

	}



	/* Don't start up if the MC ucode is missing.

	 * The default clocks and voltages before the MC ucode
@@ -1609,7 +1608,7 @@ void cayman_fini(struct radeon_device *rdev) 
	cayman_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	r100_ib_fini(rdev);

	radeon_irq_kms_fini(rdev);

	cayman_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

drivers/gpu/drm/radeon/r100.c

+20 −21
Original line number Diff line number Diff line
@@ -3752,28 +3752,10 @@ int r100_ib_test(struct radeon_device *rdev) 


void r100_ib_fini(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	radeon_ib_pool_fini(rdev);

}



int r100_ib_init(struct radeon_device *rdev)

{

	int r;



	r = radeon_ib_pool_init(rdev);

	if (r) {

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

		r100_ib_fini(rdev);

		return r;

	}

	r = r100_ib_test(rdev);

	if (r) {

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		r100_ib_fini(rdev);

		return r;

	}

	return 0;

}



void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save)

{

	/* Shutdown CP we shouldn't need to do that but better be safe than
@@ -3932,11 +3914,18 @@ static int r100_startup(struct radeon_device *rdev) 
		dev_err(rdev->dev, "failed initializing CP (%d).\n", r);

		return r;

	}

	r = r100_ib_init(rdev);



	r = radeon_ib_pool_start(rdev);

	if (r)

		return r;



	r = r100_ib_test(rdev);

	if (r) {

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

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		rdev->accel_working = false;

		return r;

	}



	return 0;

}
@@ -3959,11 +3948,14 @@ int r100_resume(struct radeon_device *rdev) 
	r100_clock_startup(rdev);

	/* Initialize surface registers */

	radeon_surface_init(rdev);



	rdev->accel_working = true;

	return r100_startup(rdev);

}



int r100_suspend(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	r100_cp_disable(rdev);

	radeon_wb_disable(rdev);

	r100_irq_disable(rdev);
@@ -4082,7 +4074,14 @@ int r100_init(struct radeon_device *rdev) 
			return r;

	}

	r100_set_safe_registers(rdev);



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

		dev_err(rdev->dev, "IB initialization failed (%d).\n", r);

		rdev->accel_working = false;

	}



	r = r100_startup(rdev);

	if (r) {

		/* Somethings want wront with the accel init stop accel */

drivers/gpu/drm/radeon/r300.c

+19 −2
Original line number Diff line number Diff line
@@ -1414,11 +1414,18 @@ static int r300_startup(struct radeon_device *rdev) 
		dev_err(rdev->dev, "failed initializing CP (%d).\n", r);

		return r;

	}

	r = r100_ib_init(rdev);



	r = radeon_ib_pool_start(rdev);

	if (r)

		return r;



	r = r100_ib_test(rdev);

	if (r) {

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

		dev_err(rdev->dev, "failed testing IB (%d).\n", r);

		rdev->accel_working = false;

		return r;

	}



	return 0;

}
@@ -1443,11 +1450,14 @@ int r300_resume(struct radeon_device *rdev) 
	r300_clock_startup(rdev);

	/* Initialize surface registers */

	radeon_surface_init(rdev);



	rdev->accel_working = true;

	return r300_startup(rdev);

}



int r300_suspend(struct radeon_device *rdev)

{

	radeon_ib_pool_suspend(rdev);

	r100_cp_disable(rdev);

	radeon_wb_disable(rdev);

	r100_irq_disable(rdev);
@@ -1548,7 +1558,14 @@ int r300_init(struct radeon_device *rdev) 
			return r;

	}

	r300_set_reg_safe(rdev);



	r = radeon_ib_pool_init(rdev);

	rdev->accel_working = true;

	if (r) {

		dev_err(rdev->dev, "IB initialization failed (%d).\n", r);

		rdev->accel_working = false;

	}



	r = r300_startup(rdev);

	if (r) {

		/* Somethings want wront with the accel init stop accel */

CRA Git | Maintained and supported by SUSTech CRA and CCSE