WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_uvd.c

 #define FIRMWARE_CYPRESS	"radeon/CYPRESS_uvd.bin"
 #define FIRMWARE_SUMO		"radeon/SUMO_uvd.bin"
 #define FIRMWARE_TAHITI		"radeon/TAHITI_uvd.bin"
 #define FIRMWARE_BONAIRE	"radeon/BONAIRE_uvd.bin"
+MODULE_FIRMWARE(FIRMWARE_R600);
+MODULE_FIRMWARE(FIRMWARE_RS780);
 MODULE_FIRMWARE(FIRMWARE_RV770);
 MODULE_FIRMWARE(FIRMWARE_RV710);
 MODULE_FIRMWARE(FIRMWARE_CYPRESS);
 MODULE_FIRMWARE(FIRMWARE_SUMO);
 MODULE_FIRMWARE(FIRMWARE_TAHITI);
 			fw_name);
 		return r;
+	}
 	bo_size = RADEON_GPU_PAGE_ALIGN(rdev->uvd_fw->size + 8) +
+		  RADEON_UVD_STACK_SIZE + RADEON_UVD_HEAP_SIZE +
-		  RADEON_UVD_STACK_SIZE + RADEON_UVD_HEAP_SIZE;
+		  RADEON_GPU_PAGE_SIZE;
 	r = radeon_bo_create(rdev, bo_size, PAGE_SIZE, true,
+			     RADEON_GEM_DOMAIN_VRAM, 0, NULL,
-			     RADEON_GEM_DOMAIN_VRAM, 0, NULL, &rdev->uvd.vcpu_bo);
+			     NULL, &rdev->uvd.vcpu_bo);
 	if (r) {
 		dev_err(rdev->dev, "(%d) failed to allocate UVD bo\n", r);
 		return r;
 		memset(ptr, 0, size);
 	return 0;
 }
 void radeon_uvd_force_into_uvd_segment(struct radeon_bo *rbo,
+				       uint32_t allowed_domains)
+{
+	int i;
-void radeon_uvd_force_into_uvd_segment(struct radeon_bo *rbo)
+	for (i = 0; i < rbo->placement.num_placement; ++i) {
+		rbo->placements[i].fpfn = 0 >> PAGE_SHIFT;
+		rbo->placements[i].lpfn = (256 * 1024 * 1024) >> PAGE_SHIFT;
+	}
+	/* If it must be in VRAM it must be in the first segment as well */
+	if (allowed_domains == RADEON_GEM_DOMAIN_VRAM)
+		return;
+	/* abort if we already have more than one placement */
+	if (rbo->placement.num_placement > 1)
+		return;
+	/* add another 256MB segment */
-{
+	rbo->placements[1] = rbo->placements[0];
+	rbo->placements[1].fpfn += (256 * 1024 * 1024) >> PAGE_SHIFT;
+	rbo->placements[1].lpfn += (256 * 1024 * 1024) >> PAGE_SHIFT;
-	rbo->placement.fpfn = 0 >> PAGE_SHIFT;
+	rbo->placement.num_placement++;
-	rbo->placement.lpfn = (256 * 1024 * 1024) >> PAGE_SHIFT;
+	rbo->placement.num_busy_placement++;
+}
 static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
 			     unsigned offset, unsigned buf_sizes[])
+{
 	int32_t *msg, msg_type, handle;
 	unsigned img_size = 0;
+	struct fence *f;
 	void *ptr;
 	int i, r;
 	if (offset & 0x3F) {
 		DRM_ERROR("UVD messages must be 64 byte aligned!\n");
+		return -EINVAL;
-		return -EINVAL;
+	}
-	}
 	f = reservation_object_get_excl(bo->tbo.resv);
-	if (bo->tbo.sync_obj) {
+	if (f) {
-		r = radeon_fence_wait(bo->tbo.sync_obj, false);
+		r = radeon_fence_wait((struct radeon_fence *)f, false);
 		if (r) {
 			DRM_ERROR("Failed waiting for UVD message (%d)!\n", r);
 static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
 			       int data0, int data1,
 			       unsigned buf_sizes[], bool *has_msg_cmd)
+{
 	struct radeon_cs_chunk *relocs_chunk;
-	struct radeon_cs_reloc *reloc;
+	struct radeon_bo_list *reloc;
 	unsigned idx, cmd, offset;
 	uint64_t start, end;
 	int r;
-	relocs_chunk = &p->chunks[p->chunk_relocs_idx];
+	relocs_chunk = p->chunk_relocs;
 	offset = radeon_get_ib_value(p, data0);
 	idx = radeon_get_ib_value(p, data1);
 	if (idx >= relocs_chunk->length_dw) {
 		DRM_ERROR("Relocs at %d after relocations chunk end %d !\n",
 			  idx, relocs_chunk->length_dw);
 		return -EINVAL;
 	}
-	reloc = p->relocs_ptr[(idx / 4)];
+	reloc = &p->relocs[(idx / 4)];
 	start = reloc->gpu_offset;
 	end = start + radeon_bo_size(reloc->robj);
 		[0x00000001]	=	32 * 1024 * 1024,
 		[0x00000002]	=	2048 * 1152 * 3,
 		[0x00000003]	=	2048,
 	};
-	if (p->chunks[p->chunk_ib_idx].length_dw % 16) {
+	if (p->chunk_ib->length_dw % 16) {
 		DRM_ERROR("UVD IB length (%d) not 16 dwords aligned!\n",
-			  p->chunks[p->chunk_ib_idx].length_dw);
+			  p->chunk_ib->length_dw);
 		return -EINVAL;
 	}
-	if (p->chunk_relocs_idx == -1) {
+	if (p->chunk_relocs == NULL) {
 		DRM_ERROR("No relocation chunk !\n");
 			break;
 		default:
 			DRM_ERROR("Unknown packet type %d !\n", pkt.type);
 			return -EINVAL;
+		}
-	} while (p->idx < p->chunks[p->chunk_ib_idx].length_dw);
+	} while (p->idx < p->chunk_ib->length_dw);
 	if (!has_msg_cmd) {
 		DRM_ERROR("UVD-IBs need a msg command!\n");
 		return -EINVAL;
+	}
 	return 0;
 }
 static int radeon_uvd_send_msg(struct radeon_device *rdev,
-			       int ring, struct radeon_bo *bo,
-			       struct radeon_fence **fence)
-{
-	struct ttm_validate_buffer tv;
+			       int ring, uint64_t addr,
-	struct ww_acquire_ctx ticket;
-	struct list_head head;
+			       struct radeon_fence **fence)
-	struct radeon_ib ib;
-	uint64_t addr;
-	int i, r;
-	memset(&tv, 0, sizeof(tv));
-	tv.bo = &bo->tbo;
-	INIT_LIST_HEAD(&head);
-	list_add(&tv.head, &head);
-	r = ttm_eu_reserve_buffers(&ticket, &head);
-	if (r)
-		return r;
-	radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_VRAM);
-	radeon_uvd_force_into_uvd_segment(bo);
 	r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);
-	if (r)
+	struct radeon_ib ib;
-		goto err;
+	int i, r;
 	r = radeon_ib_get(rdev, ring, &ib, NULL, 64);
-	if (r)
+	r = radeon_ib_get(rdev, ring, &ib, NULL, 64);
-		goto err;
+	if (r)
 		return r;
 	addr = radeon_bo_gpu_offset(bo);
 	for (i = 6; i < 16; ++i)
 		ib.ptr[i] = PACKET2(0);
 	ib.length_dw = 16;
-	r = radeon_ib_schedule(rdev, &ib, NULL, false);
-	if (r)
-		goto err;
-	ttm_eu_fence_buffer_objects(&ticket, &head, ib.fence);
+	r = radeon_ib_schedule(rdev, &ib, NULL, false);
 	if (fence)
-		*fence = radeon_fence_ref(ib.fence);
-	radeon_ib_free(rdev, &ib);
-	radeon_bo_unref(&bo);
-	return 0;
 		*fence = radeon_fence_ref(ib.fence);
 err:
-	ttm_eu_backoff_reservation(&ticket, &head);
+	radeon_ib_free(rdev, &ib);
 	return r;
+}
 /* multiple fence commands without any stream commands in between can
    crash the vcpu so just try to emmit a dummy create/destroy msg to
+   avoid this */
-   avoid this */
+int radeon_uvd_get_create_msg(struct radeon_device *rdev, int ring,
-int radeon_uvd_get_create_msg(struct radeon_device *rdev, int ring,
+			      uint32_t handle, struct radeon_fence **fence)
-			      uint32_t handle, struct radeon_fence **fence)
 {
-	struct radeon_bo *bo;
+	/* we use the last page of the vcpu bo for the UVD message */
-	uint32_t *msg;
-	int r, i;
-	r = radeon_bo_create(rdev, 1024, PAGE_SIZE, true,
-			     RADEON_GEM_DOMAIN_VRAM, 0, NULL, &bo);
-	if (r)
+	uint64_t offs = radeon_bo_size(rdev->uvd.vcpu_bo) -
-		return r;
+		RADEON_GPU_PAGE_SIZE;
-	r = radeon_bo_reserve(bo, false);
-	if (r) {
-		radeon_bo_unref(&bo);
-		return r;
+	uint32_t *msg = rdev->uvd.cpu_addr + offs;
-	}
 	uint64_t addr = rdev->uvd.gpu_addr + offs;
 	r = radeon_bo_kmap(bo, (void **)&msg);
-	if (r) {
+	int r, i;
 		radeon_bo_unreserve(bo);
 	msg[9] = cpu_to_le32(0x00000000);
 	msg[10] = cpu_to_le32(0x01b37000);
 	for (i = 11; i < 1024; ++i)
 		msg[i] = cpu_to_le32(0x0);
-	radeon_bo_kunmap(bo);
+	r = radeon_uvd_send_msg(rdev, ring, addr, fence);
-	radeon_bo_unreserve(bo);
+	radeon_bo_unreserve(rdev->uvd.vcpu_bo);
-	return radeon_uvd_send_msg(rdev, ring, bo, fence);
+	return r;
+}
 int radeon_uvd_get_destroy_msg(struct radeon_device *rdev, int ring,
+			       uint32_t handle, struct radeon_fence **fence)
-			       uint32_t handle, struct radeon_fence **fence)
+{
-{
+	/* we use the last page of the vcpu bo for the UVD message */
-	struct radeon_bo *bo;
-	uint32_t *msg;
+	uint64_t offs = radeon_bo_size(rdev->uvd.vcpu_bo) -
-	int r, i;
+		RADEON_GPU_PAGE_SIZE;
-	r = radeon_bo_create(rdev, 1024, PAGE_SIZE, true,
-			     RADEON_GEM_DOMAIN_VRAM, 0, NULL, &bo);
-	if (r)
-		return r;
-	r = radeon_bo_reserve(bo, false);
-	if (r) {
+	uint32_t *msg = rdev->uvd.cpu_addr + offs;
-		radeon_bo_unref(&bo);
+	uint64_t addr = rdev->uvd.gpu_addr + offs;
-		return r;
-	}
-	r = radeon_bo_kmap(bo, (void **)&msg);
-	if (r) {
+	int r, i;
 		radeon_bo_unreserve(bo);
-		radeon_bo_unref(&bo);
+	r = radeon_bo_reserve(rdev->uvd.vcpu_bo, true);
-		return r;
+	if (r)
 		return r;
 	/* stitch together an UVD destroy msg */
 	msg[0] = cpu_to_le32(0x00000de4);
 	msg[1] = cpu_to_le32(0x00000002);
-	msg[2] = cpu_to_le32(handle);
-	msg[3] = cpu_to_le32(0x00000000);
+	msg[2] = cpu_to_le32(handle);
-	for (i = 4; i < 1024; ++i)
+	msg[3] = cpu_to_le32(0x00000000);
-		msg[i] = cpu_to_le32(0x0);
+	for (i = 4; i < 1024; ++i)
 		msg[i] = cpu_to_le32(0x0);
 	radeon_bo_kunmap(bo);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_uvd.c – Rev 5078 → 5271