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

Commit 32699d68 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Remove defer outputs flag"

parents 23ba3106 dfc2045d

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

+5 −4
Original line number Diff line number Diff line
@@ -1931,11 +1931,12 @@ void msm_comm_validate_output_buffers(struct msm_vidc_inst *inst) 
	}

	mutex_unlock(&inst->outputbufs.lock);



	if (buffers_owned_by_driver != fmt->count_actual) {

	/* Only minimum number of DPBs are allocated */

	if (buffers_owned_by_driver != fmt->count_min) {

		dprintk(VIDC_WARN,

			"OUTPUT Buffer count mismatch %d of %d\n",

			buffers_owned_by_driver,

			fmt->count_actual);

			fmt->count_min);

		msm_vidc_handle_hw_error(inst->core);

	}

}
@@ -2005,7 +2006,7 @@ static void handle_session_flush(enum hal_command_response cmd, void *data) 
	if (msm_comm_get_stream_output_mode(inst) ==

			HAL_VIDEO_DECODER_SECONDARY) {



		if (!(inst->fmts[INPUT_PORT].defer_outputs &&

		if (!(get_v4l2_codec(inst) == V4L2_PIX_FMT_VP9 &&

				inst->in_reconfig))

			msm_comm_validate_output_buffers(inst);
@@ -4895,7 +4896,7 @@ int msm_comm_set_dpb_only_buffers(struct msm_vidc_inst *inst) 
		return -EINVAL;

	}



	if (inst->fmts[INPUT_PORT].defer_outputs)

	if (get_v4l2_codec(inst) == V4L2_PIX_FMT_VP9)

		force_release = false;



	if (msm_comm_release_dpb_only_buffers(inst, force_release))

drivers/media/platform/msm/vidc/msm_vidc_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ struct msm_vidc_format_desc { 
struct msm_vidc_format {

	char name[MAX_NAME_LENGTH];

	u8 description[32];

	bool defer_outputs;

	u32 count_min;

	u32 count_min_host;

	u32 count_actual;