Commit 16545aa3 authored by Dikshita Agarwal's avatar Dikshita Agarwal Committed by Mauro Carvalho Chehab
Browse files

media: venus: Set buffer to FW based on FW min count requirement. 



- Get the min buffer count required by FW from source event change
  and use the same value to decide actual buffer count and for
  buffer size calculation.
- Setup DPB and OPB buffers after session continue incase of
  reconfig.

Signed-off-by: default avatarDikshita Agarwal <dikshita@codeaurora.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fa622c3d

drivers/media/platform/qcom/venus/core.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ struct venus_inst { 
	u32 width;

	u32 height;

	struct v4l2_rect crop;

	u32 fw_min_cnt;

	u32 out_width;

	u32 out_height;

	u32 colorspace;

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

+7 −1
Original line number Diff line number Diff line
@@ -623,9 +623,15 @@ int venus_helper_get_bufreq(struct venus_inst *inst, u32 type, 
	if (req)

		memset(req, 0, sizeof(*req));



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

		req->count_min = inst->fw_min_cnt;



	ret = platform_get_bufreq(inst, type, req);

	if (!ret)

	if (!ret) {

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

			inst->fw_min_cnt = req->count_min;

		return 0;

	}



	ret = hfi_session_get_property(inst, ptype, &hprop);

	if (ret)

drivers/media/platform/qcom/venus/hfi_helper.h

+9 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#define HFI_PROPERTY_PARAM_VDEC_RECOVERY_POINT_SEI_EXTRADATA	0x120300c

#define HFI_PROPERTY_PARAM_VDEC_THUMBNAIL_MODE			0x120300d

#define HFI_PROPERTY_PARAM_VDEC_FRAME_ASSEMBLY			0x120300e

#define HFI_PROPERTY_PARAM_VDEC_DPB_COUNTS				0x120300e

#define HFI_PROPERTY_PARAM_VDEC_VC1_FRAMEDISP_EXTRADATA		0x1203011

#define HFI_PROPERTY_PARAM_VDEC_VC1_SEQDISP_EXTRADATA		0x1203012

#define HFI_PROPERTY_PARAM_VDEC_TIMESTAMP_EXTRADATA		0x1203013
@@ -915,6 +916,14 @@ struct hfi_extradata_input_crop { 
	u32 height;

};



struct hfi_dpb_counts {

	u32 max_dpb_count;

	u32 max_ref_frames;

	u32 max_dec_buffering;

	u32 max_reorder_frames;

	u32 fw_min_cnt;

};



#define HFI_COLOR_FORMAT_MONOCHROME		0x01

#define HFI_COLOR_FORMAT_NV12			0x02

#define HFI_COLOR_FORMAT_NV21			0x03

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

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static void event_seq_changed(struct venus_core *core, struct venus_inst *inst, 
	struct hfi_colour_space *colour_info;

	struct hfi_buffer_requirements *bufreq;

	struct hfi_extradata_input_crop *crop;

	struct hfi_dpb_counts *dpb_count;

	u8 *data_ptr;

	u32 ptype;
@@ -110,6 +111,12 @@ static void event_seq_changed(struct venus_core *core, struct venus_inst *inst, 
			event.input_crop.height = crop->height;

			data_ptr += sizeof(*crop);

			break;

		case HFI_PROPERTY_PARAM_VDEC_DPB_COUNTS:

			data_ptr += sizeof(u32);

			dpb_count = (struct hfi_dpb_counts *)data_ptr;

			event.buf_count = dpb_count->fw_min_cnt;

			data_ptr += sizeof(*dpb_count);

			break;

		default:

			break;

		}

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

+4 −2
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static int output_buffer_count(u32 session_type, u32 codec) 
			output_min_count = 6;

			break;

		case V4L2_PIX_FMT_VP9:

			output_min_count = 9;

			output_min_count = 11;

			break;

		case V4L2_PIX_FMT_H264:

		case V4L2_PIX_FMT_HEVC:
@@ -1213,6 +1213,8 @@ 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);



	bufreq->type = buftype;

	bufreq->region_size = 0;
@@ -1237,7 +1239,7 @@ static int bufreq_dec(struct hfi_plat_buffers_params *params, u32 buftype, 
	} else if (buftype == HFI_BUFFER_INTERNAL_SCRATCH(version)) {

		bufreq->size = dec_ops->scratch(width, height, is_interlaced);

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

		bufreq->size = dec_ops->scratch1(width, height, out_min_count,

		bufreq->size = dec_ops->scratch1(width, height, VB2_MAX_FRAME,

						 is_secondary_output,

						 num_vpp_pipes);

	} else if (buftype == HFI_BUFFER_INTERNAL_PERSIST_1) {