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

Commit 40f5cf99 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon: add PRIME support (v2) 



This adds prime->fd and fd->prime support to radeon.
It passes the sg object to ttm and then populates
the gart entries using it.

Compile tested only.

v2: stub kmap + use new helpers + add reimporting

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1286ff73

drivers/gpu/drm/radeon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ 
	evergreen.o evergreen_cs.o evergreen_blit_shaders.o evergreen_blit_kms.o \

	evergreen_hdmi.o radeon_trace_points.o ni.o cayman_blit_shaders.o \

	atombios_encoders.o radeon_semaphore.o radeon_sa.o atombios_i2c.o si.o \

	si_blit_shaders.o

	si_blit_shaders.o radeon_prime.o



radeon-$(CONFIG_COMPAT) += radeon_ioc32.o

radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o

drivers/gpu/drm/radeon/evergreen_blit_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ int evergreen_blit_init(struct radeon_device *rdev) 
	obj_size = ALIGN(obj_size, 256);



	r = radeon_bo_create(rdev, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				&rdev->r600_blit.shader_obj);

			     NULL, &rdev->r600_blit.shader_obj);

	if (r) {

		DRM_ERROR("evergreen failed to allocate shader\n");

		return r;

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -1231,7 +1231,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,

				     &rdev->vram_scratch.robj);

				     NULL, &rdev->vram_scratch.robj);

		if (r) {

			return r;

		}
@@ -2769,7 +2769,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,

				     &rdev->ih.ring_obj);

				     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/r600_blit_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ int r600_blit_init(struct radeon_device *rdev) 
	obj_size = ALIGN(obj_size, 256);



	r = radeon_bo_create(rdev, obj_size, PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM,

				&rdev->r600_blit.shader_obj);

			     NULL, &rdev->r600_blit.shader_obj);

	if (r) {

		DRM_ERROR("r600 failed to allocate shader\n");

		return r;

drivers/gpu/drm/radeon/radeon_benchmark.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,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, &sobj);

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

	if (r) {

		goto out_cleanup;

	}
@@ -115,7 +115,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, &dobj);

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

	if (r) {

		goto out_cleanup;

	}