nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: host: nvdla: Align max buffers per task limit

Browse Source 
- Max buffers per task limit was reduced to 384 recently as
  per all usecases from UMD
- Rename the macro to MAX_NVDLA_BUFFERS_PER_TASK to avoid
  conflict with another macro defined in nvdla_inf.h
- Reflect this change in uapi

Jira DLA-4376

Change-Id: I7d2f19901db5273ae2ae2ba7be504223c2f59e4e
Signed-off-by: Anup Mahindre <amahindre@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2517621
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Anup Mahindre
2021-04-20 15:39:18 +05:30
committed by Laxman Dewangan
parent c5b179e99d
commit ae34c03649
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,7 @@ struct nvdla_task {
struct nvdla_status_notify eof_task_status[MAX_NUM_NVDLA_OUT_TASK_STATUS]; struct nvdla_status_notify eof_task_status[MAX_NUM_NVDLA_OUT_TASK_STATUS];
struct nvdla_mem_handle sof_timestamps[MAX_NUM_NVDLA_OUT_TIMESTAMP]; struct nvdla_mem_handle sof_timestamps[MAX_NUM_NVDLA_OUT_TIMESTAMP];
struct nvdla_mem_handle eof_timestamps[MAX_NUM_NVDLA_OUT_TIMESTAMP]; struct nvdla_mem_handle eof_timestamps[MAX_NUM_NVDLA_OUT_TIMESTAMP];
struct nvdla_mem_handle memory_handles[NVDLA_MAX_BUFFERS_PER_TASK]; struct nvdla_mem_handle memory_handles[MAX_NVDLA_BUFFERS_PER_TASK];
u8 num_prefences; u8 num_prefences;
u8 num_postfences; u8 num_postfences;
u8 num_in_task_status; u8 num_in_task_status;
@@ -296,7 +296,7 @@ struct nvdla_task {
int timeout; int timeout;
int pool_index; int pool_index;
struct dma_buf *memory_dmabuf[NVDLA_MAX_BUFFERS_PER_TASK]; struct dma_buf *memory_dmabuf[MAX_NVDLA_BUFFERS_PER_TASK];
struct dma_buf *prefences_sem_dmabuf[MAX_NUM_NVDLA_PREFENCES]; struct dma_buf *prefences_sem_dmabuf[MAX_NUM_NVDLA_PREFENCES];
struct dma_buf *in_task_status_dmabuf[MAX_NUM_NVDLA_IN_TASK_STATUS]; struct dma_buf *in_task_status_dmabuf[MAX_NUM_NVDLA_IN_TASK_STATUS];
struct dma_buf *postfences_sem_dmabuf[MAX_NUM_NVDLA_POSTFENCES]; struct dma_buf *postfences_sem_dmabuf[MAX_NUM_NVDLA_POSTFENCES];

4
drivers/video/tegra/host/nvdla/nvdla_ioctl.c
View File

@@ -697,10 +697,10 @@ static int nvdla_val_task_submit_input(struct nvdla_ioctl_submit_task *in_task)
in_task->num_addresses); in_task->num_addresses);
return -EINVAL; return -EINVAL;
} }
if (in_task->num_addresses > NVDLA_MAX_BUFFERS_PER_TASK) { if (in_task->num_addresses > MAX_NVDLA_BUFFERS_PER_TASK) {
pr_err("num addresses[%u] crossing expected[%d]\n", pr_err("num addresses[%u] crossing expected[%d]\n",
in_task->num_addresses, in_task->num_addresses,
NVDLA_MAX_BUFFERS_PER_TASK); MAX_NVDLA_BUFFERS_PER_TASK);
return -EINVAL; return -EINVAL;
} }

2
include/uapi/linux/nvhost_nvdla_ioctl.h
View File

@@ -174,7 +174,7 @@ struct nvdla_ioctl_submit_task {
__u8 num_sof_timestamps; __u8 num_sof_timestamps;
__u8 num_eof_timestamps; __u8 num_eof_timestamps;
__u8 reserved0[1]; __u8 reserved0[1];
#define NVDLA_MAX_BUFFERS_PER_TASK (6144) #define MAX_NVDLA_BUFFERS_PER_TASK (384U)
__u32 num_addresses; __u32 num_addresses;
__u16 flags; __u16 flags;
__u16 reserved1; __u16 reserved1;