nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: host: dla: simplify use of fences

Browse Source 
- Currently user fences and kernel fences differs in structure,
  which requires updating prefences and postfences fields element wise.
- Use same fence structure both places for simplification
  until they really differs

Jira DLA-236

Change-Id: Ib7071a81ced489a339203b22f8eb0afce1426053
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/1266417
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Shridhar Rasal
2016-12-07 10:56:40 +05:30
committed by Laxman Dewangan
parent 7c0964a77f
commit 6b544422ad
2 changed files with 39 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/video/tegra/host/nvdla/nvdla.h
View File

@@ -71,23 +71,6 @@ struct nvdla_device {
u32 fw_version;
};
/**
* struct nvdla_task_fence: structure to hold fence info
*
* @fence_type type: Linux fd, syncpoint
* @syncpt_type type: GoS, legacy syncpoint
* @id syncpoint index
* @val syncpoint current val
* @fence syncpoint expected thresh
*/
struct nvdla_task_fence {
u32 fence_type;
u32 syncpt_type;
u32 id;
u32 val;
u32 fence;
};
/**
* struct nvdla_task: structure for task info
*
@@ -110,8 +93,8 @@ struct nvdla_task {
struct nvhost_queue *queue;
struct nvhost_buffers *buffers;
struct nvhost_syncpt *sp;
struct nvdla_task_fence *prefences;
struct nvdla_task_fence *postfences;
struct nvdla_fence *prefences;
struct nvdla_fence *postfences;
u32 fence;
struct kref ref;
struct list_head list;

88
drivers/video/tegra/host/nvdla/nvdla_queue.c
View File

@@ -49,68 +49,53 @@ static DEFINE_DMA_ATTRS(attrs);
static int nvdla_get_fences(struct nvdla_ioctl_submit_task *user_task,
struct nvdla_task *task)
{
struct nvdla_fence __user *postfences =
(struct nvdla_fence __user *)(uintptr_t)user_task->postfences;
struct nvdla_fence __user *prefences =
(struct nvdla_fence __user *)(uintptr_t)user_task->prefences;
u32 num_postfences = user_task->num_postfences;
u32 num_prefences = user_task->num_prefences;
struct nvdla_fence fence;
int err = 0;
u32 i = 0;
struct platform_device *pdev = task->queue->pool->pdev;
nvdla_dbg_fn(pdev, "copying fences");
/* get pre fences */
for (i = 0; i < num_prefences; i++, prefences++) {
err = copy_from_user(&fence, prefences,
sizeof(struct nvdla_fence));
if (err)
goto fail;
if (fence.syncpoint_index == 0)
goto fail;
task->prefences[i].fence_type = fence.type;
task->prefences[i].id = fence.syncpoint_index;
task->prefences[i].val = fence.syncpoint_value;
if (copy_from_user(task->prefences,
(void __user *)user_task->prefences,
(user_task->num_prefences * sizeof(struct nvdla_fence)))) {
err = -EFAULT;
nvdla_dbg_err(pdev, "failed to copy prefences");
goto fail;
}
/* get post fences */
for (i = 0; i < num_postfences; i++, postfences++) {
err = copy_from_user(&fence, postfences,
sizeof(struct nvdla_fence));
if (err)
goto fail;
if (fence.syncpoint_index == 0)
goto fail;
task->postfences[i].fence_type = fence.type;
if (copy_from_user(task->postfences,
(void __user *)user_task->postfences,
(user_task->num_postfences * sizeof(struct nvdla_fence)))) {
err = -EFAULT;
nvdla_dbg_err(pdev, "failed to copy postfences");
goto fail;
}
nvdla_dbg_info(pdev, "copying fences done");
fail:
return err;
}
int nvdla_send_postfences(struct nvdla_task *task,
struct nvdla_ioctl_submit_task usr_task)
struct nvdla_ioctl_submit_task user_task)
{
struct nvdla_fence __user *postfences =
(struct nvdla_fence __user *)(uintptr_t)usr_task.postfences;
u32 num_postfences = usr_task.num_postfences;
struct nvdla_fence fence;
int err = 0;
int i;
struct platform_device *pdev = task->queue->pool->pdev;
struct nvdla_fence __user *postfences =
(struct nvdla_fence __user *)(uintptr_t)user_task.postfences;
nvdla_dbg_fn(pdev, "sending post fences");
/* send post fences */
for (i = 0; i < num_postfences; i++, postfences++) {
fence.syncpoint_index = task->postfences[i].id;
fence.syncpoint_value = task->postfences[i].fence;
fence.type = task->postfences[i].fence_type;
err = copy_to_user(postfences, &fence,
sizeof(struct nvdla_fence));
if (err)
goto fail;
if (copy_to_user(postfences, task->postfences,
(user_task.num_postfences * sizeof(struct nvdla_fence)))) {
err = -EFAULT;
nvdla_dbg_err(pdev, "failed to send postfences");
goto fail;
}
nvdla_dbg_info(pdev, "postfences sent");
fail:
return err;
}
@@ -390,7 +375,7 @@ struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
/* allocate task resource */
task_size = sizeof(struct nvdla_task) +
(num_prefences + num_postfences) *
sizeof(struct nvdla_task_fence);
sizeof(struct nvdla_fence);
task = kzalloc(task_size, GFP_KERNEL);
if (!task) {
@@ -408,7 +393,7 @@ struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
mem = task;
mem += sizeof(struct nvdla_task);
task->prefences = mem;
mem += num_prefences * sizeof(struct nvdla_task_fence);
mem += num_prefences * sizeof(struct nvdla_fence);
task->postfences = mem;
/* update local fences into task*/
@@ -539,8 +524,9 @@ struct nvdla_task *nvdla_task_alloc(struct nvhost_queue *queue,
((char *)opcode + sizeof(struct dla_action_opcode));
/* update action */
preaction->address = nvhost_syncpt_address(pdev, task->prefences[i].id);
preaction->value = task->prefences[i].val;
preaction->address = nvhost_syncpt_address(pdev,
task->prefences[i].syncpoint_index);
preaction->value = task->prefences[i].syncpoint_value;
}
/* fill all postactions */
@@ -639,8 +625,8 @@ static int nvdla_queue_submit(struct nvhost_queue *queue, void *in_task)
goto fail_to_register;
/* Pass fence as through 0th postfences */
task->postfences[0].id = queue->syncpt_id;
task->postfences[0].fence = task->fence;
task->postfences[0].syncpoint_index = queue->syncpt_id;
task->postfences[0].syncpoint_value = task->fence;
/* submit task to engine */
err = nvdla_send_cmd(pdev, method_id, method_data, true);