From 7faedc509cb50f5947431a871857e4b722acb489 Mon Sep 17 00:00:00 2001 From: Govindaraj Rajagopal Date: Mon, 20 Jan 2020 14:42:22 +0530 Subject: [PATCH] msm: vidc: reduce max_packets count to 480 Currently max_packets is configured as 1000, but max outstanding packets will not exceed more than 480(16 clients x 30 pkts/client). Change-Id: I8c074e08c959473c20450bc7d62486362ba81b47 Signed-off-by: Govindaraj Rajagopal --- msm/vidc/hfi_common.c | 4 ++-- msm/vidc/msm_vidc_common.c | 5 ++--- msm/vidc/vidc_hfi_api.h | 12 +++++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/msm/vidc/hfi_common.c b/msm/vidc/hfi_common.c index 04799b26585d..1e543970eed3 100644 --- a/msm/vidc/hfi_common.c +++ b/msm/vidc/hfi_common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ #include "hfi_common.h" @@ -40,7 +40,7 @@ const struct msm_vidc_bus_data DEFAULT_BUS_VOTE = { ((a) > (b) ? (a) - (b) < TRIVIAL_BW_THRESHOLD : \ (b) - (a) < TRIVIAL_BW_THRESHOLD) -const int max_packets = 1000; +const int max_packets = 480; /* 16 sessions x 30 packets */ static void venus_hfi_pm_handler(struct work_struct *work); static DECLARE_DELAYED_WORK(venus_hfi_pm_work, venus_hfi_pm_handler); diff --git a/msm/vidc/msm_vidc_common.c b/msm/vidc/msm_vidc_common.c index b987a280ccd7..c31c560284c8 100644 --- a/msm/vidc/msm_vidc_common.c +++ b/msm/vidc/msm_vidc_common.c @@ -3440,9 +3440,8 @@ int msm_comm_reset_bufreqs(struct msm_vidc_inst *inst, enum hal_buffer buf_type) __func__, buf_type); return -EINVAL; } - bufreqs->buffer_size = bufreqs->buffer_region_size = - bufreqs->buffer_count_min = bufreqs->buffer_count_min_host = - bufreqs->buffer_count_actual = bufreqs->contiguous = + bufreqs->buffer_size = bufreqs->buffer_count_min = + bufreqs->buffer_count_min_host = bufreqs->buffer_count_actual = bufreqs->buffer_alignment = 0; return 0; diff --git a/msm/vidc/vidc_hfi_api.h b/msm/vidc/vidc_hfi_api.h index 9bc915b52388..49ceaf871d82 100644 --- a/msm/vidc/vidc_hfi_api.h +++ b/msm/vidc/vidc_hfi_api.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ #ifndef __VIDC_HFI_API_H__ @@ -184,12 +184,10 @@ struct hal_intra_refresh { struct hal_buffer_requirements { enum hal_buffer buffer_type; u32 buffer_size; - u32 buffer_region_size; - u32 buffer_count_min; - u32 buffer_count_min_host; - u32 buffer_count_actual; - u32 contiguous; - u32 buffer_alignment; + u16 buffer_count_min; + u16 buffer_count_min_host; + u16 buffer_count_actual; + u16 buffer_alignment; }; enum hal_priority {/* Priority increases with number */