4 files changed, 12 insertions, 75 deletions

diff --git a/drivers/video/tegra/host/pva/pva_ioctl.c b/drivers/video/tegra/host/pva/pva_ioctl.c
index f6af57ea0..f1297bfca 100644
--- a/drivers/video/tegra/host/pva/pva_ioctl.c
+++ b/drivers/video/tegra/host/pva/pva_ioctl.c
@@ -87,11 +87,7 @@ static int pva_copy_task(struct pva_ioctl_submit_task *ioctl_task,
         task->num_output_surfaces       = ioctl_task->num_output_surfaces;
         task->num_pointers              = ioctl_task->num_pointers;
         task->input_scalars             = ioctl_task->input_scalars;
-        task->input_2dpoint             = ioctl_task->input_2dpoint;
-        task->input_rois                = ioctl_task->input_rois;
         task->output_scalars            = ioctl_task->output_scalars;
-        task->output_2dpoint            = ioctl_task->output_2dpoint;
-        task->output_rois               = ioctl_task->output_rois;
         task->timeout                   = ioctl_task->timeout;
 
 #define COPY_FIELD(dst, src, num, type)                                 \
diff --git a/drivers/video/tegra/host/pva/pva_queue.c b/drivers/video/tegra/host/pva/pva_queue.c
index dac041faa..7c53ee7f8 100644
--- a/drivers/video/tegra/host/pva/pva_queue.c
+++ b/drivers/video/tegra/host/pva/pva_queue.c
@@ -64,23 +64,16 @@ static void pva_task_dump(struct pva_submit_task *task)
 {
         int i;
 
-        nvhost_dbg_info("task=%p, input_scalars=(handle=%u, offset=%x), "
-                        "input_surfaces=%p, input_points=(handle=%u, offset=%u), "
-                        "input_rois=(handle=%u, offset=%u), "
+        nvhost_dbg_info("task=%p, "
+                        "input_scalars=(handle=%u, offset=%x), "
+                        "input_surfaces=%p, "
                         "output_scalars=(handle=%u, offset=%u), "
-                        "output_surfaces=%p, output_points=(handle=%u, offset=%u), "
-                        "output_rois=(handle=%u, offset=%u)",
-                        task, task->input_scalars.handle,
-                        task->input_scalars.offset, task->input_surfaces,
-                        task->input_2dpoint.handle,
-                        task->input_2dpoint.offset,
-                        task->input_rois.handle, task->input_rois.offset,
-                        task->output_scalars.handle,
-                        task->output_scalars.offset,
-                        task->output_surfaces,
-                        task->output_2dpoint.handle,
-                        task->output_2dpoint.offset,
-                        task->output_rois.handle, task->output_rois.offset);
+                        "output_surfaces=%p",
+                        task,
+                        task->input_scalars.handle, task->input_scalars.offset,
+                        task->input_surfaces,
+                        task->output_scalars.handle, task->output_scalars.offset,
+                        task->output_surfaces);
 
         for (i = 0; i < task->num_prefences; i++)
                 nvhost_dbg_info("prefence %d: type=%u, "
@@ -223,11 +216,7 @@ static void pva_task_unpin_mem(struct pva_submit_task *task)
         }
 
         UNPIN_MEMORY(task->input_scalars_ext);
-        UNPIN_MEMORY(task->input_rois_ext);
-        UNPIN_MEMORY(task->input_2dpoint_ext);
         UNPIN_MEMORY(task->output_scalars_ext);
-        UNPIN_MEMORY(task->output_rois_ext);
-        UNPIN_MEMORY(task->output_2dpoint_ext);
 
 #undef UNPIN_MEMORY
 }
@@ -357,24 +346,10 @@ static int pva_task_pin_mem(struct pva_submit_task *task)
                 PIN_MEMORY(task->input_scalars_ext,
                         task->input_scalars.handle);
 
-        if (task->input_rois.handle)
-                PIN_MEMORY(task->input_rois_ext, task->input_rois.handle);
-
-        if (task->input_2dpoint.handle)
-                PIN_MEMORY(task->input_2dpoint_ext,
-                        task->input_2dpoint.handle);
-
         if (task->output_scalars.handle)
                 PIN_MEMORY(task->output_scalars_ext,
                         task->output_scalars.handle);
 
-        if (task->output_rois.handle)
-                PIN_MEMORY(task->output_rois_ext, task->output_rois.handle);
-
-        if (task->output_2dpoint.handle)
-                PIN_MEMORY(task->output_2dpoint_ext,
-                        task->output_2dpoint.handle);
-
 #undef PIN_MEMORY
 
         return 0;
@@ -753,26 +728,10 @@ static void pva_task_write_non_surfaces(struct pva_submit_task *task,
                        task->input_scalars_ext,
                        PVA_PARAM_SCALAR_LIST,
                        hw_task->task.num_input_parameters);
-        COPY_PARAMETER(hw_input_parameters, task->input_rois,
-                       task->input_rois_ext,
-                       PVA_PARAM_ROI_LIST,
-                       hw_task->task.num_input_parameters);
-        COPY_PARAMETER(hw_input_parameters, task->input_2dpoint,
-                       task->input_2dpoint_ext,
-                       PVA_PARAM_2DPOINTS_LIST,
-                       hw_task->task.num_input_parameters);
         COPY_PARAMETER(hw_output_parameters, task->output_scalars,
                        task->output_scalars_ext,
                        PVA_PARAM_SCALAR_LIST,
                        hw_task->task.num_output_parameters);
-        COPY_PARAMETER(hw_output_parameters, task->output_rois,
-                       task->output_rois_ext,
-                       PVA_PARAM_ROI_LIST,
-                       hw_task->task.num_output_parameters);
-        COPY_PARAMETER(hw_output_parameters, task->output_2dpoint,
-                       task->output_2dpoint_ext,
-                       PVA_PARAM_2DPOINTS_LIST,
-                       hw_task->task.num_output_parameters);
 #undef COPY_PARAMETER
 }
 
diff --git a/drivers/video/tegra/host/pva/pva_queue.h b/drivers/video/tegra/host/pva/pva_queue.h
index 0b34b7842..ce8ba3d46 100644
--- a/drivers/video/tegra/host/pva/pva_queue.h
+++ b/drivers/video/tegra/host/pva/pva_queue.h
@@ -63,12 +63,8 @@ struct pva_parameter_ext {
  * postfences                   Post-fence structures
  * input_surfaces               Input surfaces structures
  * input_scalars                Information for input scalars
- * input_2dpoint                Information for input 2d points
- * input_rois                   Input ROIs
  * output_surfaces              Output surfaces
  * output_scalars               Information for output scalars
- * output_2dpoint               Information for output 2d points
- * output_rois                  Output ROIs
  * input_task_status            Input status structure
  * output_task_status           Output status structure
  *
@@ -101,12 +97,8 @@ struct pva_submit_task {
         struct pva_fence postfences[PVA_MAX_POSTFENCES];
         struct pva_surface input_surfaces[PVA_MAX_INPUT_SURFACES];
         struct pva_task_parameter input_scalars;
-        struct pva_task_parameter input_2dpoint;
-        struct pva_task_parameter input_rois;
         struct pva_surface output_surfaces[PVA_MAX_OUTPUT_SURFACES];
         struct pva_task_parameter output_scalars;
-        struct pva_task_parameter output_2dpoint;
-        struct pva_task_parameter output_rois;
         struct pva_status_handle input_task_status[PVA_MAX_INPUT_STATUS];
         struct pva_status_handle output_task_status[PVA_MAX_OUTPUT_STATUS];
         struct pva_memory_handle pointers[PVA_MAX_POINTERS];
@@ -118,12 +110,8 @@ struct pva_submit_task {
         struct pva_parameter_ext postfences_sema_ext[PVA_MAX_POSTFENCES];
         struct pva_parameter_ext input_surfaces_ext[PVA_MAX_INPUT_SURFACES];
         struct pva_parameter_ext input_scalars_ext;
-        struct pva_parameter_ext input_2dpoint_ext;
-        struct pva_parameter_ext input_rois_ext;
         struct pva_parameter_ext output_surfaces_ext[PVA_MAX_OUTPUT_SURFACES];
         struct pva_parameter_ext output_scalars_ext;
-        struct pva_parameter_ext output_2dpoint_ext;
-        struct pva_parameter_ext output_rois_ext;
         struct pva_parameter_ext input_task_status_ext[PVA_MAX_INPUT_STATUS];
         struct pva_parameter_ext output_task_status_ext[PVA_MAX_OUTPUT_STATUS];
         struct pva_parameter_ext
diff --git a/include/uapi/linux/nvhost_pva_ioctl.h b/include/uapi/linux/nvhost_pva_ioctl.h
index 6088f91d5..a8aa21c87 100644
--- a/include/uapi/linux/nvhost_pva_ioctl.h
+++ b/include/uapi/linux/nvhost_pva_ioctl.h
@@ -205,12 +205,8 @@ stru