diff --git a/config/anorak_video.h b/config/anorak_video.h index 0d621eb4fc..f8d5462491 100644 --- a/config/anorak_video.h +++ b/config/anorak_video.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#define CONFIG_MSM_VIDC_ANORAK 1 #define CONFIG_MSM_VIDC_IRIS3 1 +#define CONFIG_MSM_VIDC_ANORAK 1 diff --git a/config/kalama_video.h b/config/kalama_video.h index e61c0b3081..9e06036401 100644 --- a/config/kalama_video.h +++ b/config/kalama_video.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#define CONFIG_MSM_VIDC_KALAMA 1 #define CONFIG_MSM_VIDC_IRIS3 1 +#define CONFIG_MSM_VIDC_KALAMA 1 diff --git a/config/pineapple_video.h b/config/pineapple_video.h index 032b4aafa6..ba96436124 100644 --- a/config/pineapple_video.h +++ b/config/pineapple_video.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#define CONFIG_MSM_VIDC_PINEAPPLE 1 #define CONFIG_MSM_VIDC_IRIS33 1 +#define CONFIG_MSM_VIDC_PINEAPPLE 1 diff --git a/config/waipio_video.h b/config/waipio_video.h index 238fc3268d..90d0f22c07 100644 --- a/config/waipio_video.h +++ b/config/waipio_video.h @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#define CONFIG_MSM_VIDC_WAIPIO 1 #define CONFIG_MSM_VIDC_IRIS2 1 +#define CONFIG_MSM_VIDC_WAIPIO 1 diff --git a/driver/platform/anorak/inc/msm_vidc_anorak.h b/driver/platform/anorak/inc/msm_vidc_anorak.h index af9ab3bca4..1189292321 100644 --- a/driver/platform/anorak/inc/msm_vidc_anorak.h +++ b/driver/platform/anorak/inc/msm_vidc_anorak.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_ANORAK_H_ @@ -17,6 +17,7 @@ int msm_vidc_init_platform_anorak(struct msm_vidc_core *core, struct device *dev { return -EINVAL; } + int msm_vidc_deinit_platform_anorak(struct msm_vidc_core *core, struct device *dev) { return -EINVAL; diff --git a/driver/platform/anorak/src/msm_vidc_anorak.c b/driver/platform/anorak/src/msm_vidc_anorak.c index ed82cd2193..0a08c7667a 100644 --- a/driver/platform/anorak/src/msm_vidc_anorak.c +++ b/driver/platform/anorak/src/msm_vidc_anorak.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -16,8 +16,8 @@ #include "msm_vidc_debug.h" #include "msm_vidc_internal.h" #include "msm_vidc_control_ext.h" -#include "hfi_property.h" #include "msm_vidc_iris3.h" +#include "hfi_property.h" #include "hfi_command.h" #define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8020010 diff --git a/driver/platform/common/inc/msm_vidc_platform.h b/driver/platform/common/inc/msm_vidc_platform.h index 9bd7c677df..09c43ce226 100644 --- a/driver/platform/common/inc/msm_vidc_platform.h +++ b/driver/platform/common/inc/msm_vidc_platform.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_PLATFORM_H_ @@ -12,10 +13,10 @@ #include "msm_vidc_internal.h" #include "msm_vidc_core.h" -#define DDR_TYPE_LPDDR4 0x6 -#define DDR_TYPE_LPDDR4X 0x7 -#define DDR_TYPE_LPDDR5 0x8 -#define DDR_TYPE_LPDDR5X 0x9 +#define DDR_TYPE_LPDDR4 0x6 +#define DDR_TYPE_LPDDR4X 0x7 +#define DDR_TYPE_LPDDR5 0x8 +#define DDR_TYPE_LPDDR5X 0x9 #define UBWC_CONFIG(mc, ml, hbb, bs1, bs2, bs3, bsp) \ { \ diff --git a/driver/platform/common/src/msm_vidc_platform.c b/driver/platform/common/src/msm_vidc_platform.c index 7150c46c8a..2e06742dd0 100644 --- a/driver/platform/common/src/msm_vidc_platform.c +++ b/driver/platform/common/src/msm_vidc_platform.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -15,11 +15,11 @@ #include "msm_vidc_debug.h" #include "msm_vidc_internal.h" #include "msm_vidc_memory.h" +#include "msm_vidc_control.h" +#include "msm_vidc_driver.h" #include "hfi_packet.h" #include "hfi_property.h" #include "venus_hfi.h" -#include "msm_vidc_control.h" -#include "msm_vidc_driver.h" #if defined(CONFIG_MSM_VIDC_WAIPIO) #include "msm_vidc_waipio.h" diff --git a/driver/platform/kalama/inc/msm_vidc_kalama.h b/driver/platform/kalama/inc/msm_vidc_kalama.h index 9d004502e1..e9ad036355 100644 --- a/driver/platform/kalama/inc/msm_vidc_kalama.h +++ b/driver/platform/kalama/inc/msm_vidc_kalama.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_KALAMA_H_ @@ -17,6 +17,7 @@ int msm_vidc_init_platform_kalama(struct msm_vidc_core *core, struct device *dev { return -EINVAL; } + int msm_vidc_deinit_platform_kalama(struct msm_vidc_core *core, struct device *dev) { return -EINVAL; diff --git a/driver/platform/kalama/src/kalama.c b/driver/platform/kalama/src/kalama.c index b51ba1978c..7014075780 100644 --- a/driver/platform/kalama/src/kalama.c +++ b/driver/platform/kalama/src/kalama.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_control.h" diff --git a/driver/platform/kalama/src/msm_vidc_kalama.c b/driver/platform/kalama/src/msm_vidc_kalama.c index 9f699d6ece..0c3ded4253 100644 --- a/driver/platform/kalama/src/msm_vidc_kalama.c +++ b/driver/platform/kalama/src/msm_vidc_kalama.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -17,8 +17,8 @@ #include "msm_vidc_internal.h" #include "msm_vidc_control_ext.h" #include "msm_vidc_memory_ext.h" -#include "hfi_property.h" #include "msm_vidc_iris3.h" +#include "hfi_property.h" #include "hfi_command.h" #define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8020010 diff --git a/driver/platform/pineapple/inc/msm_vidc_pineapple.h b/driver/platform/pineapple/inc/msm_vidc_pineapple.h index a0cb18f80f..fbb0c1ca9b 100644 --- a/driver/platform/pineapple/inc/msm_vidc_pineapple.h +++ b/driver/platform/pineapple/inc/msm_vidc_pineapple.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_PINEAPPLE_H_ @@ -17,6 +17,7 @@ int msm_vidc_init_platform_pineapple(struct msm_vidc_core *core, struct device * { return -EINVAL; } + int msm_vidc_deinit_platform_pineapple(struct msm_vidc_core *core, struct device *dev) { return -EINVAL; diff --git a/driver/platform/pineapple/src/msm_vidc_pineapple.c b/driver/platform/pineapple/src/msm_vidc_pineapple.c index 46c32769ab..aeef3f0c06 100644 --- a/driver/platform/pineapple/src/msm_vidc_pineapple.c +++ b/driver/platform/pineapple/src/msm_vidc_pineapple.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -17,8 +17,8 @@ #include "msm_vidc_internal.h" #include "msm_vidc_control_ext.h" #include "msm_vidc_memory_ext.h" -#include "hfi_property.h" #include "msm_vidc_iris33.h" +#include "hfi_property.h" #include "hfi_command.h" #define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8020010 diff --git a/driver/platform/pineapple/src/pineapple.c b/driver/platform/pineapple/src/pineapple.c index f83377453e..fcc1ef7c11 100644 --- a/driver/platform/pineapple/src/pineapple.c +++ b/driver/platform/pineapple/src/pineapple.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -9,8 +9,8 @@ #include "msm_vidc_pineapple.h" #include "msm_vidc_platform.h" #include "msm_vidc_debug.h" -#include "hfi_property.h" #include "msm_vidc_iris33.h" +#include "hfi_property.h" #include "hfi_command.h" #define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8020010 diff --git a/driver/platform/waipio/inc/msm_vidc_waipio.h b/driver/platform/waipio/inc/msm_vidc_waipio.h index c40fcde3cb..d230587d93 100644 --- a/driver/platform/waipio/inc/msm_vidc_waipio.h +++ b/driver/platform/waipio/inc/msm_vidc_waipio.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_WAIPIO_H_ @@ -22,10 +23,12 @@ struct context_bank_info *msm_vidc_context_bank(struct msm_vidc_core *core, { return NULL; } + int msm_vidc_init_platform_waipio(struct msm_vidc_core *core, struct device *dev) { return -EINVAL; } + int msm_vidc_deinit_platform_waipio(struct msm_vidc_core *core, struct device *dev) { return -EINVAL; diff --git a/driver/platform/waipio/src/msm_vidc_waipio.c b/driver/platform/waipio/src/msm_vidc_waipio.c index f2aaa59cd2..1233ba431b 100644 --- a/driver/platform/waipio/src/msm_vidc_waipio.c +++ b/driver/platform/waipio/src/msm_vidc_waipio.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -14,8 +14,8 @@ #include "msm_vidc_waipio.h" #include "msm_vidc_platform.h" #include "msm_vidc_debug.h" -#include "msm_vidc_internal.h" #include "msm_vidc_control_ext.h" +#include "msm_vidc_internal.h" #include "hfi_property.h" #include "hfi_command.h" diff --git a/driver/platform/waipio/src/waipio.c b/driver/platform/waipio/src/waipio.c index 3173a26242..a4e2007602 100644 --- a/driver/platform/waipio/src/waipio.c +++ b/driver/platform/waipio/src/waipio.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -8,8 +8,8 @@ #include #include "msm_vidc_control.h" -#include "msm_vidc_waipio.h" #include "msm_vidc_platform.h" +#include "msm_vidc_waipio.h" #include "msm_vidc_debug.h" #include "hfi_property.h" #include "hfi_command.h" diff --git a/driver/variant/common/inc/msm_vidc_variant.h b/driver/variant/common/inc/msm_vidc_variant.h index 1c09f48e79..dee6df24c5 100644 --- a/driver/variant/common/inc/msm_vidc_variant.h +++ b/driver/variant/common/inc/msm_vidc_variant.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2022, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_VARIANT_H_ @@ -11,12 +12,11 @@ struct msm_vidc_core; int __write_register_masked(struct msm_vidc_core *core, u32 reg, u32 value, - u32 mask); + u32 mask); int __write_register(struct msm_vidc_core *core, u32 reg, u32 value); int __read_register(struct msm_vidc_core *core, u32 reg, u32 *value); int __read_register_with_poll_timeout(struct msm_vidc_core *core, u32 reg, - u32 mask, u32 exp_val, u32 sleep_us, - u32 timeout_us); + u32 mask, u32 exp_val, u32 sleep_us, u32 timeout_us); int __set_registers(struct msm_vidc_core *core); #endif diff --git a/driver/variant/common/src/msm_vidc_variant.c b/driver/variant/common/src/msm_vidc_variant.c index 65841b7fbc..356baea21d 100644 --- a/driver/variant/common/src/msm_vidc_variant.c +++ b/driver/variant/common/src/msm_vidc_variant.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -56,9 +56,7 @@ int __write_register(struct msm_vidc_core *core, u32 reg, u32 value) base_addr += hwiosymaddr; writel_relaxed(value, base_addr); - /* - * Memory barrier to make sure value is written into the register. - */ + /* Memory barrier to make sure value is written into the register */ wmb(); return rc; diff --git a/driver/variant/iris2/inc/hfi_buffer_iris2.h b/driver/variant/iris2/inc/hfi_buffer_iris2.h index 1331c9bb70..f7e6ef379f 100644 --- a/driver/variant/iris2/inc/hfi_buffer_iris2.h +++ b/driver/variant/iris2/inc/hfi_buffer_iris2.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __HFI_BUFFER_IRIS2__ @@ -9,13 +10,13 @@ #include #include "hfi_property.h" -typedef u8 HFI_U8; -typedef s8 HFI_S8; -typedef u16 HFI_U16; -typedef s16 HFI_S16; -typedef u32 HFI_U32; -typedef s32 HFI_S32; -typedef u64 HFI_U64; +typedef u8 HFI_U8; +typedef s8 HFI_S8; +typedef u16 HFI_U16; +typedef s16 HFI_S16; +typedef u32 HFI_U32; +typedef s32 HFI_S32; +typedef u64 HFI_U64; typedef HFI_U32 HFI_BOOL; #ifndef MIN diff --git a/driver/variant/iris2/inc/msm_vidc_buffer_iris2.h b/driver/variant/iris2/inc/msm_vidc_buffer_iris2.h index 4fec123ee1..4263b0e49e 100644 --- a/driver/variant/iris2/inc/msm_vidc_buffer_iris2.h +++ b/driver/variant/iris2/inc/msm_vidc_buffer_iris2.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_BUFFER_IRIS2_H__ @@ -14,4 +15,5 @@ int msm_buffer_min_count_iris2(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); int msm_buffer_extra_count_iris2(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); + #endif // __H_MSM_VIDC_BUFFER_IRIS2_H__ diff --git a/driver/variant/iris2/inc/msm_vidc_iris2.h b/driver/variant/iris2/inc/msm_vidc_iris2.h index dd6034cba7..bf6c4b4840 100644 --- a/driver/variant/iris2/inc/msm_vidc_iris2.h +++ b/driver/variant/iris2/inc/msm_vidc_iris2.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_IRIS2_H_ @@ -17,10 +18,12 @@ static inline int msm_vidc_init_iris2(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_deinit_iris2(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_adjust_blur_type_iris2(void *instance, struct v4l2_ctrl *ctrl) { return -EINVAL; diff --git a/driver/variant/iris2/inc/msm_vidc_power_iris2.h b/driver/variant/iris2/inc/msm_vidc_power_iris2.h index 4eab42b234..e55ca5cc33 100644 --- a/driver/variant/iris2/inc/msm_vidc_power_iris2.h +++ b/driver/variant/iris2/inc/msm_vidc_power_iris2.h @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_POWER_IRIS2_H__ #define __H_MSM_VIDC_POWER_IRIS2_H__ -#include "msm_vidc_power.h" #include "msm_vidc_inst.h" +#include "msm_vidc_power.h" u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst* inst, u32 data_size); int msm_vidc_calc_bw_iris2(struct msm_vidc_inst* inst, diff --git a/driver/variant/iris2/src/msm_vidc_buffer_iris2.c b/driver/variant/iris2/src/msm_vidc_buffer_iris2.c index c0b3a5d78a..16333e6ecf 100644 --- a/driver/variant/iris2/src/msm_vidc_buffer_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_buffer_iris2.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "hfi_property.h" @@ -10,9 +11,9 @@ #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" -#include "msm_vidc_debug.h" #include "msm_media_info.h" #include "msm_vidc_platform.h" +#include "msm_vidc_debug.h" static u32 msm_vidc_decoder_bin_size_iris2(struct msm_vidc_inst *inst) { diff --git a/driver/variant/iris2/src/msm_vidc_iris2.c b/driver/variant/iris2/src/msm_vidc_iris2.c index 510dd5aa5e..a61e67dffb 100644 --- a/driver/variant/iris2/src/msm_vidc_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_iris2.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_iris2.h" #include "msm_vidc_buffer_iris2.h" #include "msm_vidc_power_iris2.h" -#include "venus_hfi.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" @@ -15,6 +15,7 @@ #include "msm_vidc_state.h" #include "msm_vidc_debug.h" #include "msm_vidc_variant.h" +#include "venus_hfi.h" #define VIDEO_ARCH_LX 1 diff --git a/driver/variant/iris2/src/msm_vidc_power_iris2.c b/driver/variant/iris2/src/msm_vidc_power_iris2.c index badec882bf..4b28fa4495 100644 --- a/driver/variant/iris2/src/msm_vidc_power_iris2.c +++ b/driver/variant/iris2/src/msm_vidc_power_iris2.c @@ -1,12 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_power_iris2.h" #include "msm_vidc_inst.h" -#include "msm_vidc_core.h" #include "msm_vidc_driver.h" +#include "msm_vidc_core.h" #include "msm_vidc_debug.h" u64 msm_vidc_calc_freq_iris2(struct msm_vidc_inst *inst, u32 data_size) diff --git a/driver/variant/iris3/inc/hfi_buffer_iris3.h b/driver/variant/iris3/inc/hfi_buffer_iris3.h index 4043d09a49..a64a694660 100644 --- a/driver/variant/iris3/inc/hfi_buffer_iris3.h +++ b/driver/variant/iris3/inc/hfi_buffer_iris3.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __HFI_BUFFER_IRIS3__ @@ -10,13 +10,13 @@ #include #include "hfi_property.h" -typedef u8 HFI_U8; -typedef s8 HFI_S8; -typedef u16 HFI_U16; -typedef s16 HFI_S16; -typedef u32 HFI_U32; -typedef s32 HFI_S32; -typedef u64 HFI_U64; +typedef u8 HFI_U8; +typedef s8 HFI_S8; +typedef u16 HFI_U16; +typedef s16 HFI_S16; +typedef u32 HFI_U32; +typedef s32 HFI_S32; +typedef u64 HFI_U64; typedef HFI_U32 HFI_BOOL; #ifndef MIN diff --git a/driver/variant/iris3/inc/msm_vidc_buffer_iris3.h b/driver/variant/iris3/inc/msm_vidc_buffer_iris3.h index a013e0e225..7548a9f25f 100644 --- a/driver/variant/iris3/inc/msm_vidc_buffer_iris3.h +++ b/driver/variant/iris3/inc/msm_vidc_buffer_iris3.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_BUFFER_IRIS3_H__ @@ -15,4 +15,5 @@ int msm_buffer_min_count_iris3(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); int msm_buffer_extra_count_iris3(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); + #endif // __H_MSM_VIDC_BUFFER_IRIS3_H__ diff --git a/driver/variant/iris3/inc/msm_vidc_iris3.h b/driver/variant/iris3/inc/msm_vidc_iris3.h index db74cb7664..60e50ba37c 100644 --- a/driver/variant/iris3/inc/msm_vidc_iris3.h +++ b/driver/variant/iris3/inc/msm_vidc_iris3.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_IRIS3_H_ @@ -18,10 +18,12 @@ static inline int msm_vidc_init_iris3(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_deinit_iris3(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_adjust_bitrate_boost_iris3(void *instance, struct v4l2_ctrl *ctrl) { return -EINVAL; diff --git a/driver/variant/iris3/inc/msm_vidc_power_iris3.h b/driver/variant/iris3/inc/msm_vidc_power_iris3.h index e4ae63f9e1..f0e4a5e017 100644 --- a/driver/variant/iris3/inc/msm_vidc_power_iris3.h +++ b/driver/variant/iris3/inc/msm_vidc_power_iris3.h @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_POWER_IRIS3_H__ #define __H_MSM_VIDC_POWER_IRIS3_H__ -#include "msm_vidc_power.h" #include "msm_vidc_inst.h" +#include "msm_vidc_power.h" u64 msm_vidc_calc_freq_iris3(struct msm_vidc_inst* inst, u32 data_size); int msm_vidc_calc_bw_iris3(struct msm_vidc_inst* inst, diff --git a/driver/variant/iris3/src/msm_vidc_buffer_iris3.c b/driver/variant/iris3/src/msm_vidc_buffer_iris3.c index 329781217b..99c72ec196 100644 --- a/driver/variant/iris3/src/msm_vidc_buffer_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_buffer_iris3.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#include "hfi_property.h" -#include "hfi_buffer_iris3.h" #include "msm_vidc_buffer_iris3.h" #include "msm_vidc_buffer.h" #include "msm_vidc_inst.h" @@ -14,6 +12,8 @@ #include "msm_vidc_debug.h" #include "msm_media_info.h" #include "msm_vidc_platform.h" +#include "hfi_property.h" +#include "hfi_buffer_iris3.h" static u32 msm_vidc_decoder_bin_size_iris3(struct msm_vidc_inst *inst) { diff --git a/driver/variant/iris3/src/msm_vidc_iris3.c b/driver/variant/iris3/src/msm_vidc_iris3.c index 3ff7f93a38..b37ec64fc2 100644 --- a/driver/variant/iris3/src/msm_vidc_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_iris3.c @@ -1,13 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_iris3.h" #include "msm_vidc_buffer_iris3.h" #include "msm_vidc_power_iris3.h" -#include "venus_hfi.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" @@ -17,6 +16,7 @@ #include "msm_vidc_state.h" #include "msm_vidc_debug.h" #include "msm_vidc_variant.h" +#include "venus_hfi.h" #define VIDEO_ARCH_LX 1 diff --git a/driver/variant/iris3/src/msm_vidc_power_iris3.c b/driver/variant/iris3/src/msm_vidc_power_iris3.c index 18a08c65b0..2ecaca5eac 100644 --- a/driver/variant/iris3/src/msm_vidc_power_iris3.c +++ b/driver/variant/iris3/src/msm_vidc_power_iris3.c @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_power_iris3.h" +#include "msm_vidc_driver.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" -#include "msm_vidc_driver.h" #include "msm_vidc_debug.h" u64 msm_vidc_calc_freq_iris3(struct msm_vidc_inst *inst, u32 data_size) diff --git a/driver/variant/iris33/inc/hfi_buffer_iris33.h b/driver/variant/iris33/inc/hfi_buffer_iris33.h index 5b835353b6..69a32d68cd 100644 --- a/driver/variant/iris33/inc/hfi_buffer_iris33.h +++ b/driver/variant/iris33/inc/hfi_buffer_iris33.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __HFI_BUFFER_IRIS3_3__ @@ -10,13 +10,13 @@ #include #include "hfi_property.h" -typedef u8 HFI_U8; -typedef s8 HFI_S8; -typedef u16 HFI_U16; -typedef s16 HFI_S16; -typedef u32 HFI_U32; -typedef s32 HFI_S32; -typedef u64 HFI_U64; +typedef u8 HFI_U8; +typedef s8 HFI_S8; +typedef u16 HFI_U16; +typedef s16 HFI_S16; +typedef u32 HFI_U32; +typedef s32 HFI_S32; +typedef u64 HFI_U64; typedef HFI_U32 HFI_BOOL; #ifndef MIN diff --git a/driver/variant/iris33/inc/msm_vidc_buffer_iris33.h b/driver/variant/iris33/inc/msm_vidc_buffer_iris33.h index 3571f7baf2..f5b4806a22 100644 --- a/driver/variant/iris33/inc/msm_vidc_buffer_iris33.h +++ b/driver/variant/iris33/inc/msm_vidc_buffer_iris33.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_BUFFER_IRIS3_3_H__ @@ -15,4 +15,5 @@ int msm_buffer_min_count_iris33(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); int msm_buffer_extra_count_iris33(struct msm_vidc_inst *inst, enum msm_vidc_buffer_type buffer_type); + #endif // __H_MSM_VIDC_BUFFER_IRIS3_3_H__ diff --git a/driver/variant/iris33/inc/msm_vidc_iris33.h b/driver/variant/iris33/inc/msm_vidc_iris33.h index bcd59ff05e..ee2aaf03f8 100644 --- a/driver/variant/iris33/inc/msm_vidc_iris33.h +++ b/driver/variant/iris33/inc/msm_vidc_iris33.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_IRIS3_3_H_ @@ -18,10 +18,12 @@ static inline int msm_vidc_init_iris33(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_deinit_iris33(struct msm_vidc_core *core) { return -EINVAL; } + static inline int msm_vidc_adjust_bitrate_boost_iris33(void *instance, struct v4l2_ctrl *ctrl) { return -EINVAL; diff --git a/driver/variant/iris33/inc/msm_vidc_power_iris33.h b/driver/variant/iris33/inc/msm_vidc_power_iris33.h index 1b7f64e826..31bf9e8dab 100644 --- a/driver/variant/iris33/inc/msm_vidc_power_iris33.h +++ b/driver/variant/iris33/inc/msm_vidc_power_iris33.h @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_POWER_IRIS3_3_H__ #define __H_MSM_VIDC_POWER_IRIS3_3_H__ -#include "msm_vidc_power.h" #include "msm_vidc_inst.h" +#include "msm_vidc_power.h" u64 msm_vidc_calc_freq_iris33(struct msm_vidc_inst* inst, u32 data_size); int msm_vidc_calc_bw_iris33(struct msm_vidc_inst* inst, diff --git a/driver/variant/iris33/src/msm_vidc_buffer_iris33.c b/driver/variant/iris33/src/msm_vidc_buffer_iris33.c index 9fb9ba882c..e7e80b65be 100644 --- a/driver/variant/iris33/src/msm_vidc_buffer_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_buffer_iris33.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -#include "hfi_property.h" -#include "hfi_buffer_iris33.h" #include "msm_vidc_buffer_iris33.h" #include "msm_vidc_buffer.h" #include "msm_vidc_inst.h" @@ -14,6 +12,8 @@ #include "msm_vidc_debug.h" #include "msm_media_info.h" #include "msm_vidc_platform.h" +#include "hfi_property.h" +#include "hfi_buffer_iris33.h" static u32 msm_vidc_decoder_bin_size_iris33(struct msm_vidc_inst *inst) { diff --git a/driver/variant/iris33/src/msm_vidc_iris33.c b/driver/variant/iris33/src/msm_vidc_iris33.c index 121753af6f..191cbb7e39 100644 --- a/driver/variant/iris33/src/msm_vidc_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_iris33.c @@ -1,14 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include "msm_vidc_iris33.h" #include "msm_vidc_buffer_iris33.h" #include "msm_vidc_power_iris33.h" -#include "venus_hfi.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" @@ -18,6 +17,7 @@ #include "msm_vidc_state.h" #include "msm_vidc_debug.h" #include "msm_vidc_variant.h" +#include "venus_hfi.h" #define VIDEO_ARCH_LX 1 diff --git a/driver/variant/iris33/src/msm_vidc_power_iris33.c b/driver/variant/iris33/src/msm_vidc_power_iris33.c index f5a775f151..6695bd3c7f 100644 --- a/driver/variant/iris33/src/msm_vidc_power_iris33.c +++ b/driver/variant/iris33/src/msm_vidc_power_iris33.c @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_power_iris33.h" +#include "msm_vidc_driver.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" -#include "msm_vidc_driver.h" #include "msm_vidc_debug.h" u64 msm_vidc_calc_freq_iris33(struct msm_vidc_inst *inst, u32 data_size) diff --git a/driver/vidc/inc/firmware.h b/driver/vidc/inc/firmware.h index 07427fd516..5c0e76f3d9 100644 --- a/driver/vidc/inc/firmware.h +++ b/driver/vidc/inc/firmware.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2022, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_FIRMWARE_H_ @@ -13,4 +14,5 @@ int fw_unload(struct msm_vidc_core *core); int fw_suspend(struct msm_vidc_core *core); int fw_resume(struct msm_vidc_core *core); + #endif diff --git a/driver/vidc/inc/fixedpoint.h b/driver/vidc/inc/fixedpoint.h index e9861bf056..1929fa6d05 100644 --- a/driver/vidc/inc/fixedpoint.h +++ b/driver/vidc/inc/fixedpoint.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifdef _FIXP_ARITH_H @@ -59,7 +60,6 @@ static inline fp_t fp_mult(fp_t a, fp_t b) return (a * b) >> FP_FRACTIONAL_BITS; } - static inline fp_t fp_div(fp_t a, fp_t b) { return (a << FP_FRACTIONAL_BITS) / b; diff --git a/driver/vidc/inc/hfi_command.h b/driver/vidc/inc/hfi_command.h index 33f9eb391e..74b87d6af0 100644 --- a/driver/vidc/inc/hfi_command.h +++ b/driver/vidc/inc/hfi_command.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_HFI_COMMAND_H__ @@ -12,6 +13,7 @@ #define HFI_VIDEO_ARCH_LX 0x1 + struct hfi_header { u32 size; u32 session_id; diff --git a/driver/vidc/inc/hfi_packet.h b/driver/vidc/inc/hfi_packet.h index 86871f25f9..cb26b07d17 100644 --- a/driver/vidc/inc/hfi_packet.h +++ b/driver/vidc/inc/hfi_packet.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _HFI_PACKET_H_ @@ -46,4 +47,5 @@ int hfi_packet_session_command(struct msm_vidc_inst *inst, u32 payload_type, void *payload, u32 payload_size); int hfi_packet_sys_intraframe_powercollapse(struct msm_vidc_core* core, u8* pkt, u32 pkt_size, u32 enable); + #endif // _HFI_PACKET_H_ diff --git a/driver/vidc/inc/hfi_property.h b/driver/vidc/inc/hfi_property.h index b70b95ee6e..084246c4a2 100644 --- a/driver/vidc/inc/hfi_property.h +++ b/driver/vidc/inc/hfi_property.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_HFI_PROPERTY_H__ @@ -357,7 +358,6 @@ enum hfi_syncframe_request_mode { HFI_SYNC_FRAME_REQUEST_WITHOUT_SEQ_HDR = 0x00000001, HFI_SYNC_FRAME_REQUEST_WITH_PREFIX_SEQ_HDR = 0x00000002, }; - #define HFI_PROP_REQUEST_SYNC_FRAME 0x03000145 #define HFI_PROP_MAX_GOP_FRAMES 0x03000146 diff --git a/driver/vidc/inc/msm_media_info.h b/driver/vidc/inc/msm_media_info.h index c0133270c2..31d25c1c9d 100644 --- a/driver/vidc/inc/msm_media_info.h +++ b/driver/vidc/inc/msm_media_info.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __MSM_MEDIA_INFO_H__ @@ -91,6 +92,7 @@ static inline unsigned int video_y_stride_pix(unsigned int colorformat, default: break; } + invalid_input: return stride; } diff --git a/driver/vidc/inc/msm_vdec.h b/driver/vidc/inc/msm_vdec.h index b9f721e567..124fce3f8d 100644 --- a/driver/vidc/inc/msm_vdec.h +++ b/driver/vidc/inc/msm_vdec.h @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VDEC_H_ #define _MSM_VDEC_H_ -#include "msm_vidc_core.h" #include "msm_vidc_inst.h" +#include "msm_vidc_core.h" int msm_vdec_streamoff_input(struct msm_vidc_inst *inst); int msm_vdec_streamon_input(struct msm_vidc_inst *inst); diff --git a/driver/vidc/inc/msm_venc.h b/driver/vidc/inc/msm_venc.h index b1519f6a82..fced6b5347 100644 --- a/driver/vidc/inc/msm_venc.h +++ b/driver/vidc/inc/msm_venc.h @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VENC_H_ #define _MSM_VENC_H_ -#include "msm_vidc_core.h" #include "msm_vidc_inst.h" +#include "msm_vidc_core.h" int msm_venc_streamoff_input(struct msm_vidc_inst *inst); int msm_venc_streamon_input(struct msm_vidc_inst *inst); diff --git a/driver/vidc/inc/msm_vidc.h b/driver/vidc/inc/msm_vidc.h index 8ba440ffa3..6fd83f4822 100644 --- a/driver/vidc/inc/msm_vidc.h +++ b/driver/vidc/inc/msm_vidc.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_H_ @@ -51,4 +52,5 @@ int msm_vidc_dqevent(void *instance, struct v4l2_event *event); int msm_vidc_g_crop(void *instance, struct v4l2_crop *a); int msm_vidc_enum_framesizes(void *instance, struct v4l2_frmsizeenum *fsize); int msm_vidc_enum_frameintervals(void *instance, struct v4l2_frmivalenum *fival); + #endif diff --git a/driver/vidc/inc/msm_vidc_buffer.h b/driver/vidc/inc/msm_vidc_buffer.h index b91fb8e169..1fb460b93d 100644 --- a/driver/vidc/inc/msm_vidc_buffer.h +++ b/driver/vidc/inc/msm_vidc_buffer.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_BUFFER_H__ @@ -8,13 +9,13 @@ #include "msm_vidc_inst.h" -#define MIN_DEC_INPUT_BUFFERS 4 +#define MIN_DEC_INPUT_BUFFERS 4 #define MIN_DEC_OUTPUT_BUFFERS 4 -#define MIN_ENC_INPUT_BUFFERS 4 +#define MIN_ENC_INPUT_BUFFERS 4 #define MIN_ENC_OUTPUT_BUFFERS 4 -#define DCVS_ENC_EXTRA_INPUT_BUFFERS 4 +#define DCVS_ENC_EXTRA_INPUT_BUFFERS 4 #define DCVS_DEC_EXTRA_OUTPUT_BUFFERS 4 u32 msm_vidc_input_min_count(struct msm_vidc_inst *inst); diff --git a/driver/vidc/inc/msm_vidc_control.h b/driver/vidc/inc/msm_vidc_control.h index ac549e05dd..84081ba3b3 100644 --- a/driver/vidc/inc/msm_vidc_control.h +++ b/driver/vidc/inc/msm_vidc_control.h @@ -2,13 +2,13 @@ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_CONTROL_H_ #define _MSM_VIDC_CONTROL_H_ -#include "msm_vidc_inst.h" #include "msm_vidc_internal.h" +#include "msm_vidc_inst.h" int msm_vidc_ctrl_init(struct msm_vidc_inst *inst); int msm_vidc_ctrl_deinit(struct msm_vidc_inst *inst); diff --git a/driver/vidc/inc/msm_vidc_control_ext.h b/driver/vidc/inc/msm_vidc_control_ext.h index 21eda3d256..bee0400202 100644 --- a/driver/vidc/inc/msm_vidc_control_ext.h +++ b/driver/vidc/inc/msm_vidc_control_ext.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_CONTROL_EXT_H_ @@ -12,7 +12,6 @@ int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_frame_rate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_dec_operating_rate(void *instance, struct v4l2_ctrl *ctrl); int msm_vidc_adjust_delivery_mode(void *instance, struct v4l2_ctrl *ctrl); - int msm_vidc_set_ir_period(void *instance, enum msm_vidc_inst_capability_type cap_id); diff --git a/driver/vidc/inc/msm_vidc_core.h b/driver/vidc/inc/msm_vidc_core.h index e2bea3c7a3..ea9bc192f8 100644 --- a/driver/vidc/inc/msm_vidc_core.h +++ b/driver/vidc/inc/msm_vidc_core.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_CORE_H_ @@ -16,7 +16,7 @@ struct msm_vidc_core; -#define MAX_EVENTS 30 +#define MAX_EVENTS 30 #define call_venus_op(d, op, ...) \ (((d) && (d)->venus_ops && (d)->venus_ops->op) ? \ diff --git a/driver/vidc/inc/msm_vidc_debug.h b/driver/vidc/inc/msm_vidc_debug.h index 6a6fa8e6ac..83094620e7 100644 --- a/driver/vidc/inc/msm_vidc_debug.h +++ b/driver/vidc/inc/msm_vidc_debug.h @@ -1,15 +1,16 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __MSM_VIDC_DEBUG__ #define __MSM_VIDC_DEBUG__ +#include #include #include #include -#include #include #include diff --git a/driver/vidc/inc/msm_vidc_driver.h b/driver/vidc/inc/msm_vidc_driver.h index ec9785ab66..d069ac4fe9 100644 --- a/driver/vidc/inc/msm_vidc_driver.h +++ b/driver/vidc/inc/msm_vidc_driver.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_DRIVER_H_ @@ -603,5 +603,6 @@ struct context_bank_info *msm_vidc_get_context_bank_for_region(struct msm_vidc_c enum msm_vidc_buffer_region region); struct context_bank_info *msm_vidc_get_context_bank_for_device( struct msm_vidc_core *core, struct device *dev); + #endif // _MSM_VIDC_DRIVER_H_ diff --git a/driver/vidc/inc/msm_vidc_events.h b/driver/vidc/inc/msm_vidc_events.h index 8ffbc964d6..248dda606d 100644 --- a/driver/vidc/inc/msm_vidc_events.h +++ b/driver/vidc/inc/msm_vidc_events.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #if !defined(_TRACE_MSM_VIDC_H) || defined(TRACE_HEADER_MULTI_READ) @@ -14,6 +15,7 @@ #define TRACE_INCLUDE_FILE msm_vidc_events #include + #include "msm_vidc_inst.h" DECLARE_EVENT_CLASS(msm_v4l2_vidc_inst, diff --git a/driver/vidc/inc/msm_vidc_fence.h b/driver/vidc/inc/msm_vidc_fence.h index 21f9cf481d..d94389f4d0 100644 --- a/driver/vidc/inc/msm_vidc_fence.h +++ b/driver/vidc/inc/msm_vidc_fence.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __H_MSM_VIDC_FENCE_H__ @@ -22,4 +22,5 @@ void msm_vidc_fence_destroy(struct msm_vidc_inst *inst, int msm_vidc_fence_init(struct msm_vidc_inst *inst); void msm_vidc_fence_deinit(struct msm_vidc_inst *inst); + #endif // __H_MSM_VIDC_FENCE_H__ diff --git a/driver/vidc/inc/msm_vidc_inst.h b/driver/vidc/inc/msm_vidc_inst.h index a6cfb049fa..0339489ef0 100644 --- a/driver/vidc/inc/msm_vidc_inst.h +++ b/driver/vidc/inc/msm_vidc_inst.h @@ -2,7 +2,7 @@ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_INST_H_ #define _MSM_VIDC_INST_H_ @@ -173,4 +173,5 @@ struct msm_vidc_inst { u32 adjust_priority; bool iframe; }; + #endif // _MSM_VIDC_INST_H_ diff --git a/driver/vidc/inc/msm_vidc_internal.h b/driver/vidc/inc/msm_vidc_internal.h index abce58913e..95fd5b980d 100644 --- a/driver/vidc/inc/msm_vidc_internal.h +++ b/driver/vidc/inc/msm_vidc_internal.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_INTERNAL_H_ @@ -46,10 +46,10 @@ enum msm_vidc_metadata_bits { MSM_VIDC_META_MAX = 0x20, }; -#define MSM_VIDC_METADATA_SIZE (4 * 4096) /* 16 KB */ -#define ENCODE_INPUT_METADATA_SIZE (512 * 4096) /* 2 MB */ -#define DECODE_INPUT_METADATA_SIZE MSM_VIDC_METADATA_SIZE -#define MSM_VIDC_METADATA_DOLBY_RPU_SIZE (41 * 1024) /* 41 KB */ +#define MSM_VIDC_METADATA_SIZE (4 * 4096) /* 16 KB */ +#define ENCODE_INPUT_METADATA_SIZE (512 * 4096) /* 2 MB */ +#define DECODE_INPUT_METADATA_SIZE MSM_VIDC_METADATA_SIZE +#define MSM_VIDC_METADATA_DOLBY_RPU_SIZE (41 * 1024) /* 41 KB */ #define MAX_NAME_LENGTH 128 #define VENUS_VERSION_LENGTH 128 diff --git a/driver/vidc/inc/msm_vidc_memory.h b/driver/vidc/inc/msm_vidc_memory.h index 0f908c8361..38e35f67c4 100644 --- a/driver/vidc/inc/msm_vidc_memory.h +++ b/driver/vidc/inc/msm_vidc_memory.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_MEMORY_H_ @@ -47,7 +48,7 @@ struct msm_memory_pool { int msm_vidc_vmem_alloc(unsigned long size, void **mem, const char *msg); void msm_vidc_vmem_free(void **addr); void *msm_vidc_pool_alloc(struct msm_vidc_inst *inst, - enum msm_memory_pool_type type); + enum msm_memory_pool_type type); void msm_vidc_pool_free(struct msm_vidc_inst *inst, void *vidc_buf); int msm_vidc_pools_init(struct msm_vidc_inst *inst); void msm_vidc_pools_deinit(struct msm_vidc_inst *inst); diff --git a/driver/vidc/inc/msm_vidc_memory_ext.h b/driver/vidc/inc/msm_vidc_memory_ext.h index bf3bfa63ee..af8613ec8e 100644 --- a/driver/vidc/inc/msm_vidc_memory_ext.h +++ b/driver/vidc/inc/msm_vidc_memory_ext.h @@ -1,14 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_MEMORY_EXT_H_ #define _MSM_VIDC_MEMORY_EXT_H_ struct msm_vidc_memory_ops; - struct msm_vidc_memory_ops *get_mem_ops_ext(void); #endif // _MSM_VIDC_MEMORY_EXT_H_ \ No newline at end of file diff --git a/driver/vidc/inc/msm_vidc_power.h b/driver/vidc/inc/msm_vidc_power.h index 40836092ab..b0d2d5c66f 100644 --- a/driver/vidc/inc/msm_vidc_power.h +++ b/driver/vidc/inc/msm_vidc_power.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_POWER_H_ @@ -253,4 +254,5 @@ u64 msm_vidc_max_freq(struct msm_vidc_inst* inst); int msm_vidc_get_inst_load(struct msm_vidc_inst *inst); int msm_vidc_scale_power(struct msm_vidc_inst *inst, bool scale_buses); void msm_vidc_power_data_reset(struct msm_vidc_inst *inst); + #endif diff --git a/driver/vidc/inc/msm_vidc_state.h b/driver/vidc/inc/msm_vidc_state.h index 9d3ca92e56..c5a35089d8 100644 --- a/driver/vidc/inc/msm_vidc_state.h +++ b/driver/vidc/inc/msm_vidc_state.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_STATE_H_ @@ -45,8 +45,7 @@ struct msm_vidc_core_state_handle { }; enum msm_vidc_allow msm_vidc_allow_core_state_change( - struct msm_vidc_core *core, - enum msm_vidc_core_state req_state); + struct msm_vidc_core *core, enum msm_vidc_core_state req_state); int msm_vidc_update_core_state(struct msm_vidc_core *core, enum msm_vidc_core_state request_state, const char *func); bool core_in_valid_state(struct msm_vidc_core *core); diff --git a/driver/vidc/inc/msm_vidc_v4l2.h b/driver/vidc/inc/msm_vidc_v4l2.h index f8748aa71c..4f7cf8d864 100644 --- a/driver/vidc/inc/msm_vidc_v4l2.h +++ b/driver/vidc/inc/msm_vidc_v4l2.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_V4L2_H_ @@ -74,4 +75,5 @@ int msm_v4l2_request_validate(struct media_request *req); void msm_v4l2_request_queue(struct media_request *req); void msm_v4l2_m2m_device_run(void *priv); void msm_v4l2_m2m_job_abort(void *priv); + #endif // _MSM_VIDC_V4L2_H_ diff --git a/driver/vidc/inc/msm_vidc_vb2.h b/driver/vidc/inc/msm_vidc_vb2.h index b25bd6bcd7..50492af4f6 100644 --- a/driver/vidc/inc/msm_vidc_vb2.h +++ b/driver/vidc/inc/msm_vidc_vb2.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_VB2_H_ @@ -43,4 +44,5 @@ void msm_vidc_buf_queue(struct vb2_buffer *vb2); void msm_vidc_buf_cleanup(struct vb2_buffer *vb); int msm_vidc_buf_out_validate(struct vb2_buffer *vb); void msm_vidc_buf_request_complete(struct vb2_buffer *vb); + #endif // _MSM_VIDC_VB2_H_ diff --git a/driver/vidc/inc/resources.h b/driver/vidc/inc/resources.h index cc00cc6120..a48348753f 100644 --- a/driver/vidc/inc/resources.h +++ b/driver/vidc/inc/resources.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _MSM_VIDC_RESOURCES_H_ @@ -19,8 +20,8 @@ struct msm_vidc_core; /* * These are helper macros to iterate over various lists within - * msm_vidc_core->resource. The intention is to cut down on a lot of boiler-plate - * code + * msm_vidc_core->resource. The intention is to cut down on a lot + * of boiler-plate code */ /* Read as "for each 'thing' in a set of 'thingies'" */ diff --git a/driver/vidc/inc/venus_hfi.h b/driver/vidc/inc/venus_hfi.h index 48f759dabc..2ca009e992 100644 --- a/driver/vidc/inc/venus_hfi.h +++ b/driver/vidc/inc/venus_hfi.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _VENUS_HFI_H_ @@ -67,11 +68,9 @@ int venus_hfi_scale_clocks(struct msm_vidc_inst* inst, u64 freq); int venus_hfi_scale_buses(struct msm_vidc_inst* inst, u64 bw_ddr, u64 bw_llcc); int venus_hfi_set_ir_period(struct msm_vidc_inst *inst, u32 ir_type, enum msm_vidc_inst_capability_type cap_id); - void venus_hfi_pm_work_handler(struct work_struct *work); irqreturn_t venus_hfi_isr(int irq, void *data); irqreturn_t venus_hfi_isr_handler(int irq, void *data); - int __prepare_pc(struct msm_vidc_core *core); #endif // _VENUS_HFI_H_ diff --git a/driver/vidc/inc/venus_hfi_queue.h b/driver/vidc/inc/venus_hfi_queue.h index 69f23cd584..7a4e97a589 100644 --- a/driver/vidc/inc/venus_hfi_queue.h +++ b/driver/vidc/inc/venus_hfi_queue.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef _VENUS_HFI_QUEUE_H_ @@ -19,13 +20,13 @@ #define HFI_Q_ID_CTRL_TO_HOST_DEBUG_Q 2 #define HFI_MASK_QHDR_STATUS 0x000000ff -#define VIDC_IFACEQ_NUMQ 3 -#define VIDC_IFACEQ_CMDQ_IDX 0 -#define VIDC_IFACEQ_MSGQ_IDX 1 -#define VIDC_IFACEQ_DBGQ_IDX 2 -#define VIDC_IFACEQ_MAX_BUF_COUNT 50 -#define VIDC_IFACE_MAX_PARALLEL_CLNTS 16 -#define VIDC_IFACEQ_DFLT_QHDR 0x01010000 +#define VIDC_IFACEQ_NUMQ 3 +#define VIDC_IFACEQ_CMDQ_IDX 0 +#define VIDC_IFACEQ_MSGQ_IDX 1 +#define VIDC_IFACEQ_DBGQ_IDX 2 +#define VIDC_IFACEQ_MAX_BUF_COUNT 50 +#define VIDC_IFACE_MAX_PARALLEL_CLNTS 16 +#define VIDC_IFACEQ_DFLT_QHDR 0x01010000 struct hfi_queue_table_header { u32 qtbl_version; diff --git a/driver/vidc/inc/venus_hfi_response.h b/driver/vidc/inc/venus_hfi_response.h index 776164a8e8..1d76830a93 100644 --- a/driver/vidc/inc/venus_hfi_response.h +++ b/driver/vidc/inc/venus_hfi_response.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021,, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __VENUS_HFI_RESPONSE_H__ @@ -22,4 +23,5 @@ void fw_coredump(struct msm_vidc_core *core); int handle_release_output_buffer(struct msm_vidc_inst *inst, struct hfi_buffer *buffer); + #endif // __VENUS_HFI_RESPONSE_H__ diff --git a/driver/vidc/src/firmware.c b/driver/vidc/src/firmware.c index 039deb57d7..d18bb511ca 100644 --- a/driver/vidc/src/firmware.c +++ b/driver/vidc/src/firmware.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -13,8 +13,8 @@ #include "msm_vidc_core.h" #include "msm_vidc_debug.h" #include "msm_vidc_events.h" -#include "firmware.h" #include "msm_vidc_platform.h" +#include "firmware.h" #define MAX_FIRMWARE_NAME_SIZE 128 diff --git a/driver/vidc/src/hfi_packet.c b/driver/vidc/src/hfi_packet.c index ed97776f85..f1ea0a4a46 100644 --- a/driver/vidc/src/hfi_packet.c +++ b/driver/vidc/src/hfi_packet.c @@ -1,14 +1,15 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "hfi_packet.h" #include "msm_vidc_core.h" #include "msm_vidc_inst.h" #include "msm_vidc_driver.h" -#include "msm_vidc_debug.h" #include "msm_vidc_platform.h" +#include "msm_vidc_debug.h" u32 get_hfi_port(struct msm_vidc_inst *inst, enum msm_vidc_port_type port) diff --git a/driver/vidc/src/msm_vdec.c b/driver/vidc/src/msm_vdec.c index c20d6e04b1..5b2516d38c 100644 --- a/driver/vidc/src/msm_vdec.c +++ b/driver/vidc/src/msm_vdec.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_media_info.h" #include @@ -19,6 +19,7 @@ #include "msm_vidc_memory.h" #include "venus_hfi.h" #include "hfi_packet.h" + /* TODO: update based on clips */ #define MAX_DEC_BATCH_SIZE 6 #define SKIP_BATCH_WINDOW 100 diff --git a/driver/vidc/src/msm_venc.c b/driver/vidc/src/msm_venc.c index 0f4d6303ab..690d9bb109 100644 --- a/driver/vidc/src/msm_venc.c +++ b/driver/vidc/src/msm_venc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_media_info.h" @@ -11,8 +12,8 @@ #include "msm_vidc_driver.h" #include "msm_vidc_internal.h" #include "msm_vidc_control.h" -#include "msm_vidc_debug.h" #include "msm_vidc_power.h" +#include "msm_vidc_debug.h" #include "venus_hfi.h" #include "hfi_packet.h" #include "msm_vidc_platform.h" diff --git a/driver/vidc/src/msm_vidc.c b/driver/vidc/src/msm_vidc.c index dbf212dfc5..f81b1e54b7 100644 --- a/driver/vidc/src/msm_vidc.c +++ b/driver/vidc/src/msm_vidc.c @@ -2,10 +2,11 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include + #include "msm_vidc_core.h" #include "msm_vidc_inst.h" #include "msm_vdec.h" diff --git a/driver/vidc/src/msm_vidc_buffer.c b/driver/vidc/src/msm_vidc_buffer.c index 78f90eb5c7..6828ce616e 100644 --- a/driver/vidc/src/msm_vidc_buffer.c +++ b/driver/vidc/src/msm_vidc_buffer.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_media_info.h" @@ -8,8 +9,8 @@ #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" -#include "msm_vidc_debug.h" #include "msm_vidc_internal.h" +#include "msm_vidc_debug.h" /* Generic function for all targets. Not being used for iris2 */ u32 msm_vidc_input_min_count(struct msm_vidc_inst* inst) diff --git a/driver/vidc/src/msm_vidc_control.c b/driver/vidc/src/msm_vidc_control.c index 26a5b9d954..1c7f7f8a41 100644 --- a/driver/vidc/src/msm_vidc_control.c +++ b/driver/vidc/src/msm_vidc_control.c @@ -2,13 +2,13 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ -#include "msm_vidc_debug.h" #include "msm_vidc_internal.h" #include "msm_vidc_driver.h" #include "msm_venc.h" #include "msm_vidc_platform.h" +#include "msm_vidc_debug.h" extern struct msm_vidc_core *g_core; diff --git a/driver/vidc/src/msm_vidc_control_ext.c b/driver/vidc/src/msm_vidc_control_ext.c index b526f2df19..367dba0963 100644 --- a/driver/vidc/src/msm_vidc_control_ext.c +++ b/driver/vidc/src/msm_vidc_control_ext.c @@ -1,11 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include "msm_vidc_control_ext.h" -#include "msm_vidc_debug.h" #include "hfi_packet.h" #include "hfi_property.h" #include "venus_hfi.h" @@ -13,6 +12,7 @@ #include "msm_vidc_driver.h" #include "msm_venc.h" #include "msm_vidc_platform.h" +#include "msm_vidc_debug.h" int msm_vidc_adjust_ir_period(void *instance, struct v4l2_ctrl *ctrl) { diff --git a/driver/vidc/src/msm_vidc_debug.c b/driver/vidc/src/msm_vidc_debug.c index 133acf28e7..5fb35624b5 100644 --- a/driver/vidc/src/msm_vidc_debug.c +++ b/driver/vidc/src/msm_vidc_debug.c @@ -1,7 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ + #define CREATE_TRACE_POINTS #include "msm_vidc_debug.h" #include "msm_vidc_driver.h" diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c index 510f857cf9..6724546f2b 100644 --- a/driver/vidc/src/msm_vidc_driver.c +++ b/driver/vidc/src/msm_vidc_driver.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -16,7 +16,6 @@ #include "msm_vidc_state.h" #include "msm_vidc_power.h" #include "msm_vidc_debug.h" -#include "msm_vidc_power.h" #include "msm_vidc.h" #include "msm_vdec.h" #include "msm_venc.h" diff --git a/driver/vidc/src/msm_vidc_fence.c b/driver/vidc/src/msm_vidc_fence.c index fcb8b639fd..8c941a5509 100644 --- a/driver/vidc/src/msm_vidc_fence.c +++ b/driver/vidc/src/msm_vidc_fence.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_fence.h" -#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" +#include "msm_vidc_debug.h" extern struct msm_vidc_core *g_core; diff --git a/driver/vidc/src/msm_vidc_memory.c b/driver/vidc/src/msm_vidc_memory.c index 80a7bf7aba..e7dff4681e 100644 --- a/driver/vidc/src/msm_vidc_memory.c +++ b/driver/vidc/src/msm_vidc_memory.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -8,8 +9,8 @@ #include #include "msm_vidc_memory.h" -#include "msm_vidc_debug.h" #include "msm_vidc_internal.h" +#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" #include "msm_vidc_core.h" #include "msm_vidc_events.h" diff --git a/driver/vidc/src/msm_vidc_memory_ext.c b/driver/vidc/src/msm_vidc_memory_ext.c index 50712b45ce..8ea094712b 100644 --- a/driver/vidc/src/msm_vidc_memory_ext.c +++ b/driver/vidc/src/msm_vidc_memory_ext.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -11,8 +11,8 @@ #include #include "msm_vidc_core.h" -#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" +#include "msm_vidc_debug.h" #include "msm_vidc_events.h" #include "msm_vidc_platform.h" #include "msm_vidc_memory.h" diff --git a/driver/vidc/src/msm_vidc_power.c b/driver/vidc/src/msm_vidc_power.c index b7a91a3f3f..824f13484c 100644 --- a/driver/vidc/src/msm_vidc_power.c +++ b/driver/vidc/src/msm_vidc_power.c @@ -1,12 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_power.h" -#include "msm_vidc_debug.h" #include "msm_vidc_internal.h" +#include "msm_vidc_debug.h" #include "msm_vidc_inst.h" #include "msm_vidc_core.h" #include "msm_vidc_driver.h" diff --git a/driver/vidc/src/msm_vidc_probe.c b/driver/vidc/src/msm_vidc_probe.c index 561ac1f2e6..f4522fcfcd 100644 --- a/driver/vidc/src/msm_vidc_probe.c +++ b/driver/vidc/src/msm_vidc_probe.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2022, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -20,8 +21,8 @@ #endif #include "msm_vidc_internal.h" -#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" +#include "msm_vidc_debug.h" #include "msm_vidc_state.h" #include "msm_vidc_platform.h" #include "msm_vidc_core.h" diff --git a/driver/vidc/src/msm_vidc_state.c b/driver/vidc/src/msm_vidc_state.c index 5fe4522d2b..6f521deade 100644 --- a/driver/vidc/src/msm_vidc_state.c +++ b/driver/vidc/src/msm_vidc_state.c @@ -1,13 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_driver.h" #include "msm_vidc_state.h" -#include "msm_vidc_debug.h" #include "msm_vidc_core.h" +#include "msm_vidc_debug.h" bool core_in_valid_state(struct msm_vidc_core *core) { diff --git a/driver/vidc/src/msm_vidc_v4l2.c b/driver/vidc/src/msm_vidc_v4l2.c index 9dcadd7085..f7b37ef78d 100644 --- a/driver/vidc/src/msm_vidc_v4l2.c +++ b/driver/vidc/src/msm_vidc_v4l2.c @@ -1,14 +1,15 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_v4l2.h" #include "msm_vidc_internal.h" #include "msm_vidc_core.h" #include "msm_vidc_inst.h" -#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" +#include "msm_vidc_debug.h" #include "msm_vidc.h" #include "msm_vidc_events.h" diff --git a/driver/vidc/src/msm_vidc_vb2.c b/driver/vidc/src/msm_vidc_vb2.c index b92d394617..ec9c37da68 100644 --- a/driver/vidc/src/msm_vidc_vb2.c +++ b/driver/vidc/src/msm_vidc_vb2.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include "msm_vidc_vb2.h" #include "msm_vidc_core.h" @@ -10,9 +10,9 @@ #include "msm_vidc_internal.h" #include "msm_vidc_driver.h" #include "msm_vidc_power.h" +#include "msm_vidc_debug.h" #include "msm_vdec.h" #include "msm_venc.h" -#include "msm_vidc_debug.h" #include "msm_vidc_control.h" #include "msm_vidc_platform.h" diff --git a/driver/vidc/src/resources.c b/driver/vidc/src/resources.c index 40c4a44238..559f2d7445 100644 --- a/driver/vidc/src/resources.c +++ b/driver/vidc/src/resources.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -14,8 +14,8 @@ #endif #include "msm_vidc_core.h" -#include "msm_vidc_debug.h" #include "msm_vidc_power.h" +#include "msm_vidc_debug.h" #include "msm_vidc_driver.h" #include "msm_vidc_platform.h" #include "venus_hfi.h" diff --git a/driver/vidc/src/venus_hfi.c b/driver/vidc/src/venus_hfi.c index 4ed7278503..bce2ef3950 100644 --- a/driver/vidc/src/venus_hfi.c +++ b/driver/vidc/src/venus_hfi.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ -/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ +/* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -21,8 +21,8 @@ #include "msm_vidc_power.h" #include "msm_vidc_platform.h" #include "msm_vidc_memory.h" -#include "msm_vidc_driver.h" #include "msm_vidc_debug.h" +#include "msm_vidc_driver.h" #include "hfi_packet.h" #include "venus_hfi_response.h" #include "venus_hfi_queue.h" diff --git a/driver/vidc/src/venus_hfi_queue.c b/driver/vidc/src/venus_hfi_queue.c index f4e2a07a71..dcad7e3fe7 100644 --- a/driver/vidc/src/venus_hfi_queue.c +++ b/driver/vidc/src/venus_hfi_queue.c @@ -2,11 +2,11 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ - /* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. */ + /* Copyright (c) 2022-2023. Qualcomm Innovation Center, Inc. All rights reserved. */ #include "venus_hfi_queue.h" -#include "msm_vidc_debug.h" #include "msm_vidc_core.h" +#include "msm_vidc_debug.h" #include "msm_vidc_memory.h" #include "msm_vidc_platform.h" diff --git a/driver/vidc/src/venus_hfi_response.c b/driver/vidc/src/venus_hfi_response.c index 5cefd244c3..0be8d85408 100644 --- a/driver/vidc/src/venus_hfi_response.c +++ b/driver/vidc/src/venus_hfi_response.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include + #include "hfi_packet.h" #include "venus_hfi.h" #include "venus_hfi_response.h" diff --git a/include/uapi/vidc/media/v4l2_vidc_extensions.h b/include/uapi/vidc/media/v4l2_vidc_extensions.h index 8215ee4d98..51d8a51b46 100644 --- a/include/uapi/vidc/media/v4l2_vidc_extensions.h +++ b/include/uapi/vidc/media/v4l2_vidc_extensions.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __V4l2_VIDC_EXTENSIONS_H__ @@ -78,6 +79,7 @@ enum v4l2_mpeg_vidc_ir_type { V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_RANDOM = 0x0, V4L2_MPEG_VIDEO_VIDC_INTRA_REFRESH_CYCLIC = 0x1, }; + #define V4L2_CID_MPEG_VIDC_TIME_DELTA_BASED_RC (V4L2_CID_MPEG_VIDC_BASE + 0xD) /* Encoder quality controls */ #define V4L2_CID_MPEG_VIDC_CONTENT_ADAPTIVE_CODING \