Commit 58b64dd0 authored by Dikshita Agarwal's avatar Dikshita Agarwal Committed by Mauro Carvalho Chehab
Browse files

media: venus: update calculation for dpb buffers 



Use dpb color format, width and height of output port
for calculating buffer size of dpb buffers.

Acked-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 30956077

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

+4 −0
Original line number Diff line number Diff line
@@ -636,12 +636,16 @@ static int platform_get_bufreq(struct venus_inst *inst, u32 buftype, 
	if (is_dec) {

		params.width = inst->width;

		params.height = inst->height;

		params.out_width = inst->out_width;

		params.out_height = inst->out_height;

		params.codec = inst->fmt_out->pixfmt;

		params.hfi_color_fmt = to_hfi_raw_fmt(inst->fmt_cap->pixfmt);

		params.dec.max_mbs_per_frame = mbs_per_frame_max(inst);

		params.dec.buffer_size_limit = 0;

		params.dec.is_secondary_output =

			inst->opb_buftype == HFI_BUFFER_OUTPUT2;

		if (params.dec.is_secondary_output)

			params.hfi_dpb_color_fmt = inst->dpb_fmt;

		params.dec.is_interlaced =

			inst->pic_struct != HFI_INTERLACE_FRAME_PROGRESSIVE;

	} else {

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

+3 −0
Original line number Diff line number Diff line
@@ -12,8 +12,11 @@ 
struct hfi_plat_buffers_params {

	u32 width;

	u32 height;

	u32 out_width;

	u32 out_height;

	u32 codec;

	u32 hfi_color_fmt;

	u32 hfi_dpb_color_fmt;

	enum hfi_version version;

	u32 num_vpp_pipes;

	union {

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

+8 −3
Original line number Diff line number Diff line
@@ -1185,6 +1185,7 @@ static int bufreq_dec(struct hfi_plat_buffers_params *params, u32 buftype, 
	enum hfi_version version = params->version;

	u32 codec = params->codec;

	u32 width = params->width, height = params->height, out_min_count;

	u32 out_width = params->out_width, out_height = params->out_height;

	struct dec_bufsize_ops *dec_ops;

	bool is_secondary_output = params->dec.is_secondary_output;

	bool is_interlaced = params->dec.is_interlaced;
@@ -1230,12 +1231,16 @@ static int bufreq_dec(struct hfi_plat_buffers_params *params, u32 buftype, 
			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) {

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

		bufreq->count_min = out_min_count;

		bufreq->size =

			venus_helper_get_framesz_raw(params->hfi_color_fmt,

						     width, height);

						     out_width, out_height);

		if (buftype == HFI_BUFFER_OUTPUT &&

		    params->dec.is_secondary_output)

			bufreq->size =

				venus_helper_get_framesz_raw(params->hfi_dpb_color_fmt,

							     out_width, out_height);

	} 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)) {