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

Commit 831b6966 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alex Deucher
Browse files

drm/radeon: export reservation_object from dmabuf to ttm 



Adds an extra argument to radeon_bo_create, which is only used in radeon_prime.c.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 392a250b

drivers/gpu/drm/radeon/cik.c

+2 −2
Original line number Diff line number Diff line
@@ -4687,7 +4687,7 @@ static int cik_mec_init(struct radeon_device *rdev) 
		r = radeon_bo_create(rdev,

				     rdev->mec.num_mec *rdev->mec.num_pipe * MEC_HPD_SIZE * 2,

				     PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT, 0, NULL,

				     RADEON_GEM_DOMAIN_GTT, 0, NULL, NULL,

				     &rdev->mec.hpd_eop_obj);

		if (r) {

			dev_warn(rdev->dev, "(%d) create HDP EOP bo failed\n", r);
@@ -4858,7 +4858,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) 
					     sizeof(struct bonaire_mqd),

					     PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_GTT, 0, NULL,

					     &rdev->ring[idx].mqd_obj);

					     NULL, &rdev->ring[idx].mqd_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create MQD bo failed\n", r);

				return r;

drivers/gpu/drm/radeon/evergreen.c

+3 −3
Original line number Diff line number Diff line
@@ -4022,7 +4022,7 @@ int sumo_rlc_init(struct radeon_device *rdev) 
		if (rdev->rlc.save_restore_obj == NULL) {

			r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.save_restore_obj);

					     NULL, &rdev->rlc.save_restore_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC sr bo failed\n", r);

				return r;
@@ -4101,7 +4101,7 @@ int sumo_rlc_init(struct radeon_device *rdev) 
		if (rdev->rlc.clear_state_obj == NULL) {

			r = radeon_bo_create(rdev, dws * 4, PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.clear_state_obj);

					     NULL, &rdev->rlc.clear_state_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC c bo failed\n", r);

				sumo_rlc_fini(rdev);
@@ -4178,7 +4178,7 @@ int sumo_rlc_init(struct radeon_device *rdev) 
			r = radeon_bo_create(rdev, rdev->rlc.cp_table_size,

					     PAGE_SIZE, true,

					     RADEON_GEM_DOMAIN_VRAM, 0, NULL,

					     &rdev->rlc.cp_table_obj);

					     NULL, &rdev->rlc.cp_table_obj);

			if (r) {

				dev_warn(rdev->dev, "(%d) create RLC cp table bo failed\n", r);

				sumo_rlc_fini(rdev);

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ int r600_vram_scratch_init(struct radeon_device *rdev) 
	if (rdev->vram_scratch.robj == NULL) {

		r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE,

				     PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				     0, NULL, &rdev->vram_scratch.robj);

				     0, NULL, NULL, &rdev->vram_scratch.robj);

		if (r) {

			return r;

		}
@@ -3368,7 +3368,7 @@ int r600_ih_ring_alloc(struct radeon_device *rdev) 
		r = radeon_bo_create(rdev, rdev->ih.ring_size,

				     PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT, 0,

				     NULL, &rdev->ih.ring_obj);

				     NULL, NULL, &rdev->ih.ring_obj);

		if (r) {

			DRM_ERROR("radeon: failed to create ih ring buffer (%d).\n", r);

			return r;

drivers/gpu/drm/radeon/radeon_benchmark.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size, 
	int time;



	n = RADEON_BENCHMARK_ITERATIONS;

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, sdomain, 0, NULL, &sobj);

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, sdomain, 0, NULL, NULL, &sobj);

	if (r) {

		goto out_cleanup;

	}
@@ -105,7 +105,7 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size, 
	if (r) {

		goto out_cleanup;

	}

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, ddomain, 0, NULL, &dobj);

	r = radeon_bo_create(rdev, size, PAGE_SIZE, true, ddomain, 0, NULL, NULL, &dobj);

	if (r) {

		goto out_cleanup;

	}

drivers/gpu/drm/radeon/radeon_device.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ int radeon_wb_init(struct radeon_device *rdev) 


	if (rdev->wb.wb_obj == NULL) {

		r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE, PAGE_SIZE, true,

				     RADEON_GEM_DOMAIN_GTT, 0, NULL,

				     RADEON_GEM_DOMAIN_GTT, 0, NULL, NULL,

				     &rdev->wb.wb_obj);

		if (r) {

			dev_warn(rdev->dev, "(%d) create WB bo failed\n", r);