Merge "msm: vidc: enable 24 sessions for IOT specific targets" (a07b243d) · Commits · e / devices / android_kernel_oneplus_sm7250

msm/vidc/msm_v4l2_vidc.c

+8 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#include <linux/debugfs.h>
		@@ -491,6 +491,11 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev)

		core->platform_data = vidc_get_drv_data(&pdev->dev);
		dev_set_drvdata(&pdev->dev, core);
		vidc_driver->ctxt = kcalloc(core->platform_data->max_inst_count,
		sizeof(*vidc_driver->ctxt), GFP_KERNEL);
		if (!vidc_driver->ctxt)
		return -ENOMEM;
		vidc_driver->num_ctxt = core->platform_data->max_inst_count;
		rc = msm_vidc_initialize_core(pdev, core);
		if (rc) {
		d_vpr_e("Failed to init core\n");
		@@ -620,6 +625,7 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev)
		err_core_init:
		dev_set_drvdata(&pdev->dev, NULL);
		kfree(core);
		kfree(vidc_driver->ctxt);
		return rc;
		}

		@@ -701,6 +707,7 @@ static int msm_vidc_remove(struct platform_device *pdev)
		mutex_destroy(&core->resources.cb_lock);
		mutex_destroy(&core->lock);
		kfree(core);
		kfree(vidc_driver->ctxt);
		return rc;
		}

msm/vidc/msm_vidc_common.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -3074,7 +3074,6 @@ static int msm_comm_init_core(struct msm_vidc_inst *inst)
		core->state = VIDC_CORE_INIT;
		core->smmu_fault_handled = false;
		core->trigger_ssr = false;
		core->resources.max_inst_count = MAX_SUPPORTED_INSTANCES;
		core->resources.max_secure_inst_count =
		core->resources.max_secure_inst_count ?
		core->resources.max_secure_inst_count :

msm/vidc/msm_vidc_debug.c

+11 −13

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#define CREATE_TRACE_POINTS
		@@ -31,8 +31,6 @@ int msm_vidc_err_recovery_disable = !1;
		atomic_read(&__binfo->ref_count) >= 2 ? "video driver" : "firmware";\
		})

		struct log_cookie ctxt[MAX_SUPPORTED_INSTANCES];

		struct core_inst_pair {
		struct msm_vidc_core *core;
		struct msm_vidc_inst *inst;
		@@ -611,16 +609,16 @@ int get_sid(u32 *sid, u32 session_type)
		{
		int i;

		for (i = 0; i < MAX_SUPPORTED_INSTANCES; i++) {
		if (!ctxt[i].used) {
		ctxt[i].used = 1;
		for (i = 0; i < vidc_driver->num_ctxt; i++) {
		if (!vidc_driver->ctxt[i].used) {
		vidc_driver->ctxt[i].used = 1;
		*sid = i+1;
		update_log_ctxt(*sid, session_type, 0);
		break;
		}
		}

		return (i == MAX_SUPPORTED_INSTANCES);
		return (i == vidc_driver->num_ctxt);
		}

		inline void update_log_ctxt(u32 sid, u32 session_type, u32 fourcc)
		@@ -629,7 +627,7 @@ inline void update_log_ctxt(u32 sid, u32 session_type, u32 fourcc)
		char type;
		u32 s_type = 0;

		if (!sid \|\| sid > MAX_SUPPORTED_INSTANCES) {
		if (!sid \|\| sid > vidc_driver->num_ctxt) {
		d_vpr_e("%s: invalid sid %#x\n",
		__func__, sid);
		}
		@@ -685,10 +683,10 @@ inline void update_log_ctxt(u32 sid, u32 session_type, u32 fourcc)
		break;
		}

		ctxt[sid-1].session_type = s_type;
		ctxt[sid-1].codec_type = fourcc;
		memcpy(&ctxt[sid-1].name, codec, 4);
		ctxt[sid-1].name[4] = type;
		ctxt[sid-1].name[5] = '\0';
		vidc_driver->ctxt[sid-1].session_type = s_type;
		vidc_driver->ctxt[sid-1].codec_type = fourcc;
		memcpy(&vidc_driver->ctxt[sid-1].name, codec, 4);
		vidc_driver->ctxt[sid-1].name[4] = type;
		vidc_driver->ctxt[sid-1].name[5] = '\0';
		}

msm/vidc/msm_vidc_debug.h

+8 −16

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
		*/

		#ifndef __MSM_VIDC_DEBUG__
		@@ -69,13 +69,6 @@ enum vidc_err_recovery_disable {
		VIDC_DISABLE_NON_NOC_ERR_RECOV = 0x0002
		};

		struct log_cookie {
		u32 used;
		u32 session_type;
		u32 codec_type;
		char name[20];
		};

		extern int msm_vidc_debug;
		extern int msm_vidc_fw_debug_mode;
		extern bool msm_vidc_fw_coverage;
		@@ -85,7 +78,6 @@ extern bool msm_vidc_syscache_disable;
		extern bool msm_vidc_lossless_encode;
		extern bool msm_vidc_cvp_usage;
		extern int msm_vidc_err_recovery_disable;
		extern struct log_cookie ctxt[MAX_SUPPORTED_INSTANCES];

		#define dprintk(__level, sid, __fmt, ...) \
		do { \
		@@ -213,10 +205,10 @@ static inline bool is_print_allowed(u32 sid, u32 level)
		if (!((msm_vidc_debug >> 8) & 0xF))
		return true;

		if (!sid \|\| sid > MAX_SUPPORTED_INSTANCES)
		if (!sid \|\| sid > vidc_driver->num_ctxt)
		return true;

		if (ctxt[sid-1].session_type & msm_vidc_debug)
		if (vidc_driver->ctxt[sid-1].session_type & msm_vidc_debug)
		return true;

		return false;
		@@ -224,21 +216,21 @@ static inline bool is_print_allowed(u32 sid, u32 level)

		static inline char *get_codec_name(u32 sid)
		{
		if (!sid \|\| sid > MAX_SUPPORTED_INSTANCES)
		if (!sid \|\| sid > vidc_driver->num_ctxt)
		return ".....";

		return ctxt[sid-1].name;
		return vidc_driver->ctxt[sid-1].name;
		}

		static inline void put_sid(u32 sid)
		{
		if (!sid \|\| sid > MAX_SUPPORTED_INSTANCES) {
		if (!sid \|\| sid > vidc_driver->num_ctxt) {
		d_vpr_e("%s: invalid sid %#x\n",
		__func__, sid);
		return;
		}
		if (ctxt[sid-1].used)
		ctxt[sid-1].used = 0;
		if (vidc_driver->ctxt[sid-1].used)
		vidc_driver->ctxt[sid-1].used = 0;
		}

		static inline void tic(struct msm_vidc_inst *i, enum profiling_points p,

msm/vidc/msm_vidc_internal.h

+12 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@
		#define MAX_NUM_INPUT_BUFFERS VIDEO_MAX_FRAME // same as VB2_MAX_FRAME
		#define MAX_NUM_OUTPUT_BUFFERS VIDEO_MAX_FRAME // same as VB2_MAX_FRAME

		#define MAX_SUPPORTED_INSTANCES 24
		#define MAX_SUPPORTED_INSTANCES 16
		#define MAX_SUPPORTED_INSTANCES_24 24

		/* Maintains the number of FTB's between each FBD over a window */
		#define DCVS_FTB_WINDOW 16
		@@ -303,6 +304,7 @@ struct msm_vidc_platform_data {
		uint32_t vpu_ver;
		uint32_t num_vpp_pipes;
		struct msm_vidc_ubwc_config_data *ubwc_config;
		uint32_t max_inst_count;
		};

		struct msm_vidc_format_desc {
		@@ -329,6 +331,13 @@ struct msm_vidc_format_constraint {
		u32 uv_buffer_alignment;
		};

		struct log_cookie {
		u32 used;
		u32 session_type;
		u32 codec_type;
		char name[20];
		};

		struct msm_vidc_drv {
		struct mutex lock;
		struct list_head cores;
		@@ -336,6 +345,8 @@ struct msm_vidc_drv {
		struct dentry *debugfs_root;
		int thermal_level;
		u32 sku_version;
		struct log_cookie *ctxt;
		u32 num_ctxt;
		};

		struct msm_video_device {