Commit 41d41b03 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Mauro Carvalho Chehab
Browse files

media: venus: Use newly-introduced hfi_buffer_requirements accessors 



Now that we have a way which is independent of the HFI version to set
the correct fields in hfi_buffer_requirements, use it!

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent bbfc89e6

drivers/media/platform/qcom/venus/helpers.c

+3 −2
Original line number Diff line number Diff line
@@ -668,6 +668,7 @@ int venus_helper_get_bufreq(struct venus_inst *inst, u32 type, 
			    struct hfi_buffer_requirements *req)

{

	u32 ptype = HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS;

	enum hfi_version ver = inst->core->res->hfi_version;

	union hfi_get_property hprop;

	unsigned int i;

	int ret;
@@ -675,12 +676,12 @@ int venus_helper_get_bufreq(struct venus_inst *inst, u32 type, 
	memset(req, 0, sizeof(*req));



	if (type == HFI_BUFFER_OUTPUT || type == HFI_BUFFER_OUTPUT2)

		req->count_min = inst->fw_min_cnt;

		hfi_bufreq_set_count_min(req, ver, inst->fw_min_cnt);



	ret = platform_get_bufreq(inst, type, req);

	if (!ret) {

		if (type == HFI_BUFFER_OUTPUT || type == HFI_BUFFER_OUTPUT2)

			inst->fw_min_cnt = req->count_min;

			inst->fw_min_cnt = hfi_bufreq_get_count_min(req, ver);

		return 0;

	}

drivers/media/platform/qcom/venus/hfi_plat_bufs_v6.c

+11 −11
Original line number Diff line number Diff line
@@ -1215,24 +1215,24 @@ static int bufreq_dec(struct hfi_plat_buffers_params *params, u32 buftype, 


	out_min_count = output_buffer_count(VIDC_SESSION_TYPE_DEC, codec);

	/* Max of driver and FW count */

	out_min_count = max(out_min_count, bufreq->count_min);

	out_min_count = max(out_min_count, hfi_bufreq_get_count_min(bufreq, version));



	bufreq->type = buftype;

	bufreq->region_size = 0;

	bufreq->count_min = 1;

	bufreq->count_actual = 1;

	bufreq->hold_count = 1;

	hfi_bufreq_set_count_min(bufreq, version, 1);

	hfi_bufreq_set_hold_count(bufreq, version, 1);

	bufreq->contiguous = 1;

	bufreq->alignment = 256;



	if (buftype == HFI_BUFFER_INPUT) {

		bufreq->count_min = MIN_INPUT_BUFFERS;

		hfi_bufreq_set_count_min(bufreq, version, MIN_INPUT_BUFFERS);

		bufreq->size =

			calculate_dec_input_frame_size(width, height, codec,

						       max_mbs_per_frame,

						       buffer_size_limit);

	} else if (buftype == HFI_BUFFER_OUTPUT || buftype == HFI_BUFFER_OUTPUT2) {

		bufreq->count_min = out_min_count;

		hfi_bufreq_set_count_min(bufreq, version, out_min_count);

		bufreq->size =

			venus_helper_get_framesz_raw(params->hfi_color_fmt,

						     out_width, out_height);
@@ -1269,7 +1269,7 @@ static int bufreq_enc(struct hfi_plat_buffers_params *params, u32 buftype, 
	u32 work_mode = params->enc.work_mode;

	u32 rc_type = params->enc.rc_type;

	u32 num_vpp_pipes = params->num_vpp_pipes;

	u32 num_ref;

	u32 num_ref, count_min;



	switch (codec) {

	case V4L2_PIX_FMT_H264:
@@ -1289,21 +1289,21 @@ static int bufreq_enc(struct hfi_plat_buffers_params *params, u32 buftype, 


	bufreq->type = buftype;

	bufreq->region_size = 0;

	bufreq->count_min = 1;

	bufreq->count_actual = 1;

	bufreq->hold_count = 1;

	hfi_bufreq_set_count_min(bufreq, version, 1);

	hfi_bufreq_set_hold_count(bufreq, version, 1);

	bufreq->contiguous = 1;

	bufreq->alignment = 256;



	if (buftype == HFI_BUFFER_INPUT) {

		bufreq->count_min = MIN_INPUT_BUFFERS;

		hfi_bufreq_set_count_min(bufreq, version, MIN_INPUT_BUFFERS);

		bufreq->size =

			venus_helper_get_framesz_raw(params->hfi_color_fmt,

						     width, height);

	} else if (buftype == HFI_BUFFER_OUTPUT ||

		   buftype == HFI_BUFFER_OUTPUT2) {

		bufreq->count_min =

			output_buffer_count(VIDC_SESSION_TYPE_ENC, codec);

		count_min = output_buffer_count(VIDC_SESSION_TYPE_ENC, codec);

		hfi_bufreq_set_count_min(bufreq, version, count_min);

		bufreq->size = calculate_enc_output_frame_size(width, height,

							       rc_type);

	} else if (buftype == HFI_BUFFER_INTERNAL_SCRATCH(version)) {