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

Commit c978fede authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Change bus governor for vidc for sdm845"

parents 66482fae f0bbd53a

arch/arm64/boot/dts/qcom/sdm845-vidc.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
			label = "venus-ddr";

			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;

			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;

			qcom,bus-governor = "performance";

			qcom,bus-governor = "msm-vidc-ddr";

			qcom,bus-range-kbps = <1000 3388000>;

		};

		arm9_bus_ddr {

drivers/media/platform/msm/vidc/governors/msm_vidc_dyn_gov.c

+196 −374

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/platform/msm/vidc/hfi_response_handler.c

+7 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,13 @@ static int hfi_process_session_etb_done(u32 device_id, 
	data_done.status = hfi_map_err_status(pkt->error_type);

	data_done.size = sizeof(struct msm_vidc_cb_data_done);

	data_done.clnt_data = pkt->input_tag;

	data_done.input_done.recon_stats.buffer_index =

		pkt->ubwc_cr_stats.frame_index;

	memcpy(&data_done.input_done.recon_stats.ubwc_stats_info,

		&pkt->ubwc_cr_stats.ubwc_stats_info,

		sizeof(data_done.input_done.recon_stats.ubwc_stats_info));

	data_done.input_done.recon_stats.complexity_number =

		pkt->ubwc_cr_stats.complexity_number;

	data_done.input_done.offset = pkt->offset;

	data_done.input_done.filled_len = pkt->filled_len;

	data_done.input_done.packet_buffer =

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ static int msm_vidc_remove(struct platform_device *pdev) 
	v4l2_device_unregister(&core->v4l2_dev);



	msm_vidc_free_platform_resources(&core->resources);

	kfree(core->vote_data);

	sysfs_remove_group(&pdev->dev.kobj, &msm_vidc_core_attr_group);

	dev_set_drvdata(&pdev->dev, NULL);

	mutex_destroy(&core->lock);

drivers/media/platform/msm/vidc/msm_vdec.c

+2 −0
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f) 
				msm_comm_get_hal_output_buffer(inst),

				f->fmt.pix_mp.pixelformat);



		inst->clk_data.opb_fourcc = f->fmt.pix_mp.pixelformat;

		if (msm_comm_get_stream_output_mode(inst) ==

			HAL_VIDEO_DECODER_SECONDARY) {

			frame_sz.buffer_type = HAL_BUFFER_OUTPUT2;
@@ -1056,6 +1057,7 @@ int msm_vdec_s_ext_ctrl(struct msm_vidc_inst *inst, 
							"%s Failed to get buffer requirements : %d\n",

							__func__, rc);

				}

				inst->clk_data.dpb_fourcc = fourcc;

				break;

			default:

				dprintk(VIDC_ERR,