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

Commit f04997bd authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: hfi: preparation to support venus 4xx 



This covers the differences between 1xx,3xx and 4xx.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Reviewed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Tested-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent ea8afbab

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

+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ struct venus_inst { 
	struct hfi_buffer_requirements bufreq[HFI_BUFFER_TYPE_MAX];

};



#define IS_V1(core)	((core)->res->hfi_version == HFI_VERSION_1XX)

#define IS_V3(core)	((core)->res->hfi_version == HFI_VERSION_3XX)

#define IS_V4(core)	((core)->res->hfi_version == HFI_VERSION_4XX)



#define ctrl_to_inst(ctrl)	\

	container_of((ctrl)->handler, struct venus_inst, ctrl_handler)

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

+38 −18
Original line number Diff line number Diff line
@@ -166,21 +166,38 @@ static int intbufs_unset_buffers(struct venus_inst *inst) 
	return ret;

}



static const unsigned int intbuf_types[] = {

	HFI_BUFFER_INTERNAL_SCRATCH,

	HFI_BUFFER_INTERNAL_SCRATCH_1,

	HFI_BUFFER_INTERNAL_SCRATCH_2,

static const unsigned int intbuf_types_1xx[] = {

	HFI_BUFFER_INTERNAL_SCRATCH(HFI_VERSION_1XX),

	HFI_BUFFER_INTERNAL_SCRATCH_1(HFI_VERSION_1XX),

	HFI_BUFFER_INTERNAL_SCRATCH_2(HFI_VERSION_1XX),

	HFI_BUFFER_INTERNAL_PERSIST,

	HFI_BUFFER_INTERNAL_PERSIST_1,

};



static const unsigned int intbuf_types_4xx[] = {

	HFI_BUFFER_INTERNAL_SCRATCH(HFI_VERSION_4XX),

	HFI_BUFFER_INTERNAL_SCRATCH_1(HFI_VERSION_4XX),

	HFI_BUFFER_INTERNAL_SCRATCH_2(HFI_VERSION_4XX),

	HFI_BUFFER_INTERNAL_PERSIST,

	HFI_BUFFER_INTERNAL_PERSIST_1,

};



static int intbufs_alloc(struct venus_inst *inst)

{

	unsigned int i;

	const unsigned int *intbuf;

	size_t arr_sz, i;

	int ret;



	for (i = 0; i < ARRAY_SIZE(intbuf_types); i++) {

		ret = intbufs_set_buffer(inst, intbuf_types[i]);

	if (IS_V4(inst->core)) {

		arr_sz = ARRAY_SIZE(intbuf_types_4xx);

		intbuf = intbuf_types_4xx;

	} else {

		arr_sz = ARRAY_SIZE(intbuf_types_1xx);

		intbuf = intbuf_types_1xx;

	}



	for (i = 0; i < arr_sz; i++) {

		ret = intbufs_set_buffer(inst, intbuf[i]);

		if (ret)

			goto error;

	}
@@ -257,20 +274,23 @@ static int load_scale_clocks(struct venus_core *core) 


set_freq:



	if (core->res->hfi_version == HFI_VERSION_3XX) {

	ret = clk_set_rate(clk, freq);

		ret |= clk_set_rate(core->core0_clk, freq);

		ret |= clk_set_rate(core->core1_clk, freq);

	} else {

		ret = clk_set_rate(clk, freq);

	}

	if (ret)

		goto err;



	if (ret) {

		dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);

		return ret;

	}

	ret = clk_set_rate(core->core0_clk, freq);

	if (ret)

		goto err;



	ret = clk_set_rate(core->core1_clk, freq);

	if (ret)

		goto err;



	return 0;



err:

	dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);

	return ret;

}



static void fill_buffer_desc(const struct venus_buffer *buf,

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

+49 −7
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 
#define HFI_EXTRADATA_METADATA_FILLER			0x7fe00002



#define HFI_INDEX_EXTRADATA_INPUT_CROP			0x0700000e

#define HFI_INDEX_EXTRADATA_OUTPUT_CROP			0x0700000f

#define HFI_INDEX_EXTRADATA_DIGITAL_ZOOM		0x07000010

#define HFI_INDEX_EXTRADATA_ASPECT_RATIO		0x7f100003
@@ -376,13 +377,18 @@ 
#define HFI_BUFFER_OUTPUT2			0x3

#define HFI_BUFFER_INTERNAL_PERSIST		0x4

#define HFI_BUFFER_INTERNAL_PERSIST_1		0x5

#define HFI_BUFFER_INTERNAL_SCRATCH		0x1000001

#define HFI_BUFFER_EXTRADATA_INPUT		0x1000002

#define HFI_BUFFER_EXTRADATA_OUTPUT		0x1000003

#define HFI_BUFFER_EXTRADATA_OUTPUT2		0x1000004

#define HFI_BUFFER_INTERNAL_SCRATCH_1		0x1000005

#define HFI_BUFFER_INTERNAL_SCRATCH_2		0x1000006



#define HFI_BUFFER_INTERNAL_SCRATCH(ver)	\

	(((ver) == HFI_VERSION_4XX) ? 0x6 : 0x1000001)

#define HFI_BUFFER_INTERNAL_SCRATCH_1(ver)	\

	(((ver) == HFI_VERSION_4XX) ? 0x7 : 0x1000005)

#define HFI_BUFFER_INTERNAL_SCRATCH_2(ver)	\

	(((ver) == HFI_VERSION_4XX) ? 0x8 : 0x1000006)

#define HFI_BUFFER_EXTRADATA_INPUT(ver)		\

	(((ver) == HFI_VERSION_4XX) ? 0xc : 0x1000002)

#define HFI_BUFFER_EXTRADATA_OUTPUT(ver)	\

	(((ver) == HFI_VERSION_4XX) ? 0xa : 0x1000003)

#define HFI_BUFFER_EXTRADATA_OUTPUT2(ver)	\

	(((ver) == HFI_VERSION_4XX) ? 0xb : 0x1000004)

#define HFI_BUFFER_TYPE_MAX			11



#define HFI_BUFFER_MODE_STATIC			0x1000001
@@ -424,12 +430,14 @@ 
#define HFI_PROPERTY_PARAM_CODEC_MASK_SUPPORTED			0x100e

#define HFI_PROPERTY_PARAM_MVC_BUFFER_LAYOUT			0x100f

#define HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED		0x1010

#define HFI_PROPERTY_PARAM_WORK_MODE				0x1015



/*

 * HFI_PROPERTY_CONFIG_COMMON_START

 * HFI_DOMAIN_BASE_COMMON + HFI_ARCH_COMMON_OFFSET + 0x2000

 */

#define HFI_PROPERTY_CONFIG_FRAME_RATE				0x2001

#define HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE			0x2002



/*

 * HFI_PROPERTY_PARAM_VDEC_COMMON_START
@@ -438,6 +446,9 @@ 
#define HFI_PROPERTY_PARAM_VDEC_MULTI_STREAM			0x1003001

#define HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR			0x1003002

#define HFI_PROPERTY_PARAM_VDEC_NONCP_OUTPUT2			0x1003003

#define HFI_PROPERTY_PARAM_VDEC_PIXEL_BITDEPTH			0x1003007

#define HFI_PROPERTY_PARAM_VDEC_PIC_STRUCT			0x1003009

#define HFI_PROPERTY_PARAM_VDEC_COLOUR_SPACE			0x100300a



/*

 * HFI_PROPERTY_CONFIG_VDEC_COMMON_START
@@ -518,6 +529,7 @@ 
enum hfi_version {

	HFI_VERSION_1XX,

	HFI_VERSION_3XX,

	HFI_VERSION_4XX

};



struct hfi_buffer_info {
@@ -767,6 +779,22 @@ struct hfi_framesize { 
	u32 height;

};



#define VIDC_CORE_ID_DEFAULT	0

#define VIDC_CORE_ID_1		1

#define VIDC_CORE_ID_2		2

#define VIDC_CORE_ID_3		3



struct hfi_videocores_usage_type {

	u32 video_core_enable_mask;

};



#define VIDC_WORK_MODE_1	1

#define VIDC_WORK_MODE_2	2



struct hfi_video_work_mode {

	u32 video_work_mode;

};



struct hfi_h264_vui_timing_info {

	u32 enable;

	u32 fixed_framerate;
@@ -961,6 +989,12 @@ struct hfi_buffer_count_actual { 
	u32 count_actual;

};



struct hfi_buffer_count_actual_4xx {

	u32 type;

	u32 count_actual;

	u32 count_min_host;

};



struct hfi_buffer_size_actual {

	u32 type;

	u32 size;
@@ -971,6 +1005,14 @@ struct hfi_buffer_display_hold_count_actual { 
	u32 hold_count;

};



/* HFI 4XX reorder the fields, use these macros */

#define HFI_BUFREQ_HOLD_COUNT(bufreq, ver)	\

	((ver) == HFI_VERSION_4XX ? 0 : (bufreq)->hold_count)

#define HFI_BUFREQ_COUNT_MIN(bufreq, ver)	\

	((ver) == HFI_VERSION_4XX ? (bufreq)->hold_count : (bufreq)->count_min)

#define HFI_BUFREQ_COUNT_MIN_HOST(bufreq, ver)	\

	((ver) == HFI_VERSION_4XX ? (bufreq)->count_min : 0)



struct hfi_buffer_requirements {

	u32 type;

	u32 size;

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

+7 −0
Original line number Diff line number Diff line
@@ -110,4 +110,11 @@ 
#define WRAPPER_CPU_STATUS			(WRAPPER_BASE + 0x2014)

#define WRAPPER_SW_RESET			(WRAPPER_BASE + 0x3000)



/* Venus 4xx */

#define WRAPPER_VCODEC0_MMCC_POWER_STATUS	(WRAPPER_BASE + 0x90)

#define WRAPPER_VCODEC0_MMCC_POWER_CONTROL	(WRAPPER_BASE + 0x94)



#define WRAPPER_VCODEC1_MMCC_POWER_STATUS	(WRAPPER_BASE + 0x110)

#define WRAPPER_VCODEC1_MMCC_POWER_CONTROL	(WRAPPER_BASE + 0x114)



#endif

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

+3 −2
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ static int vdec_queue_setup(struct vb2_queue *q, 


static int vdec_verify_conf(struct venus_inst *inst)

{

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

	struct hfi_buffer_requirements bufreq;

	int ret;
@@ -698,14 +699,14 @@ static int vdec_verify_conf(struct venus_inst *inst) 
		return ret;



	if (inst->num_output_bufs < bufreq.count_actual ||

	    inst->num_output_bufs < bufreq.count_min)

	    inst->num_output_bufs < HFI_BUFREQ_COUNT_MIN(&bufreq, ver))

		return -EINVAL;



	ret = venus_helper_get_bufreq(inst, HFI_BUFFER_INPUT, &bufreq);

	if (ret)

		return ret;



	if (inst->num_input_bufs < bufreq.count_min)

	if (inst->num_input_bufs < HFI_BUFREQ_COUNT_MIN(&bufreq, ver))

		return -EINVAL;



	return 0;