Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da3c372f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge cdf413bd on remote branch 

Change-Id: Ie7378c28b54ae072e779f7927bfbc3cbb2a9cb7a
parents f42f8bad cdf413bd

msm/vidc/hfi_ar50_lt.c

+0 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
#define VIDC_WRAPPER_INTR_MASK_A2HCPU_BMSK_AR50_LT	0x4

#define VIDC_WRAPPER_INTR_MASK_A2HCPU_SHFT_AR50_LT	0x2



#define VIDC_WRAPPER_INTR_CLEAR_AR50_LT		(VIDC_WRAPPER_BASE_OFFS_AR50_LT + 0x14)

#define VIDC_WRAPPER_INTR_CLEAR_A2HWD_BMSK_AR50_LT	0x10

#define VIDC_WRAPPER_INTR_CLEAR_A2HWD_SHFT_AR50_LT	0x4

#define VIDC_WRAPPER_INTR_CLEAR_A2H_BMSK_AR50_LT	0x4
@@ -246,7 +245,6 @@ void __core_clear_interrupt_ar50_lt(struct venus_hfi_device *device) 
	}



	__write_register(device, VIDC_CPU_CS_A2HSOFTINTCLR_AR50_LT, 1, DEFAULT_SID);

	__write_register(device, VIDC_WRAPPER_INTR_CLEAR_AR50_LT, intr_status, DEFAULT_SID);

}



int __boot_firmware_ar50_lt(struct venus_hfi_device *device, u32 sid)

msm/vidc/hfi_iris2.c

+3 −1
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ void __noc_error_info_iris2(struct venus_hfi_device *device) 
	u32 val = 0;

	u32 sid = DEFAULT_SID;



	if (device->res->vpu_ver == VPU_VERSION_IRIS2_1)

		return;

	val = __read_register(device, VCODEC_NOC_ERL_MAIN_SWID_LOW, sid);

	d_vpr_e("VCODEC_NOC_ERL_MAIN_SWID_LOW:     %#x\n", val);

	val = __read_register(device, VCODEC_NOC_ERL_MAIN_SWID_HIGH, sid);
@@ -389,7 +391,7 @@ void __core_clear_interrupt_iris2(struct venus_hfi_device *device) 
int __boot_firmware_iris2(struct venus_hfi_device *device, u32 sid)

{

	int rc = 0;

	u32 ctrl_init_val = 0, ctrl_status = 0, count = 0, max_tries = 1000;

	u32 ctrl_init_val = 0, ctrl_status = 0, count = 0, max_tries = 5000;



	ctrl_init_val = BIT(0);

	if (device->res->cvp_internal)

msm/vidc/msm_vidc_common.c

+4 −1
Original line number Diff line number Diff line
@@ -3429,7 +3429,7 @@ static void msm_vidc_print_running_insts(struct msm_vidc_core *core) 
		inp_f = &temp->fmts[INPUT_PORT].v4l2_fmt;

		if (temp->state >= MSM_VIDC_OPEN_DONE &&

				temp->state < MSM_VIDC_STOP_DONE) {

			char properties[4] = "";

			char properties[5] = "";



			if (is_thumbnail_session(temp))

				strlcat(properties, "N", sizeof(properties));
@@ -3440,6 +3440,9 @@ static void msm_vidc_print_running_insts(struct msm_vidc_core *core) 
			if (is_realtime_session(temp))

				strlcat(properties, "R", sizeof(properties));



			if (is_grid_session(temp))

				strlcat(properties, "I", sizeof(properties));



			if (temp->clk_data.operating_rate)

				op_rate = temp->clk_data.operating_rate >> 16;

			else

msm/vidc/msm_vidc_debug.c

+3 −1
Original line number Diff line number Diff line
@@ -271,7 +271,8 @@ struct dentry *msm_vidc_debugfs_init_core(struct msm_vidc_core *core, 


	snprintf(debugfs_name, MAX_DEBUGFS_NAME, "core%d", core->id);

	dir = debugfs_create_dir(debugfs_name, parent);

	if (!dir) {

	if (IS_ERR_OR_NULL(dir)) {

		dir = NULL;

		d_vpr_e("Failed to create debugfs for msm_vidc\n");

		goto failed_create_dir;

	}
@@ -492,6 +493,7 @@ struct dentry *msm_vidc_debugfs_init_inst(struct msm_vidc_inst *inst, 


	dir = debugfs_create_dir(debugfs_name, parent);

	if (IS_ERR_OR_NULL(dir)) {

		dir = NULL;

		s_vpr_e(inst->sid, "Failed to create debugfs for msm_vidc\n");

		goto failed_create_dir;

	}