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

media: venus: helpers: export few helper functions 



Here we export few helper function to use them from decoder to
implement more granular control needed for stateful Codec API
compliance.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent d162aea8

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

+17 −12
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt) 
}

EXPORT_SYMBOL_GPL(venus_helper_check_codec);



static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)

int venus_helper_queue_dpb_bufs(struct venus_inst *inst)

{

	struct intbuf *buf;

	int ret = 0;
@@ -100,6 +100,7 @@ static int venus_helper_queue_dpb_bufs(struct venus_inst *inst) 
fail:

	return ret;

}

EXPORT_SYMBOL_GPL(venus_helper_queue_dpb_bufs);



int venus_helper_free_dpb_bufs(struct venus_inst *inst)

{
@@ -278,7 +279,7 @@ static const unsigned int intbuf_types_4xx[] = { 
	HFI_BUFFER_INTERNAL_PERSIST_1,

};



static int intbufs_alloc(struct venus_inst *inst)

int venus_helper_intbufs_alloc(struct venus_inst *inst)

{

	const unsigned int *intbuf;

	size_t arr_sz, i;
@@ -304,11 +305,13 @@ static int intbufs_alloc(struct venus_inst *inst) 
	intbufs_unset_buffers(inst);

	return ret;

}

EXPORT_SYMBOL_GPL(venus_helper_intbufs_alloc);



static int intbufs_free(struct venus_inst *inst)

int venus_helper_intbufs_free(struct venus_inst *inst)

{

	return intbufs_unset_buffers(inst);

}

EXPORT_SYMBOL_GPL(venus_helper_intbufs_free);



static u32 load_per_instance(struct venus_inst *inst)

{
@@ -339,7 +342,7 @@ static u32 load_per_type(struct venus_core *core, u32 session_type) 
	return mbs_per_sec;

}



static int load_scale_clocks(struct venus_core *core)

int venus_helper_load_scale_clocks(struct venus_core *core)

{

	const struct freq_tbl *table = core->res->freq_tbl;

	unsigned int num_rows = core->res->freq_tbl_size;
@@ -388,6 +391,7 @@ static int load_scale_clocks(struct venus_core *core) 
	dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);

	return ret;

}

EXPORT_SYMBOL_GPL(venus_helper_load_scale_clocks);



static void fill_buffer_desc(const struct venus_buffer *buf,

			     struct hfi_buffer_desc *bd, bool response)
@@ -472,7 +476,7 @@ static bool is_dynamic_bufmode(struct venus_inst *inst) 
	return caps->cap_bufs_mode_dynamic;

}



static int session_unregister_bufs(struct venus_inst *inst)

int venus_helper_unregister_bufs(struct venus_inst *inst)

{

	struct venus_buffer *buf, *n;

	struct hfi_buffer_desc bd;
@@ -489,6 +493,7 @@ static int session_unregister_bufs(struct venus_inst *inst) 


	return ret;

}

EXPORT_SYMBOL_GPL(venus_helper_unregister_bufs);



static int session_register_bufs(struct venus_inst *inst)

{
@@ -1009,8 +1014,8 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q) 
	if (inst->streamon_out & inst->streamon_cap) {

		ret = hfi_session_stop(inst);

		ret |= hfi_session_unload_res(inst);

		ret |= session_unregister_bufs(inst);

		ret |= intbufs_free(inst);

		ret |= venus_helper_unregister_bufs(inst);

		ret |= venus_helper_intbufs_free(inst);

		ret |= hfi_session_deinit(inst);



		if (inst->session_error || core->sys_error)
@@ -1021,7 +1026,7 @@ void venus_helper_vb2_stop_streaming(struct vb2_queue *q) 


		venus_helper_free_dpb_bufs(inst);



		load_scale_clocks(core);

		venus_helper_load_scale_clocks(core);

		INIT_LIST_HEAD(&inst->registeredbufs);

	}
@@ -1041,7 +1046,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst) 
	struct venus_core *core = inst->core;

	int ret;



	ret = intbufs_alloc(inst);

	ret = venus_helper_intbufs_alloc(inst);

	if (ret)

		return ret;
@@ -1049,7 +1054,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst) 
	if (ret)

		goto err_bufs_free;



	load_scale_clocks(core);

	venus_helper_load_scale_clocks(core);



	ret = hfi_session_load_res(inst);

	if (ret)
@@ -1070,9 +1075,9 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst) 
err_unload_res:

	hfi_session_unload_res(inst);

err_unreg_bufs:

	session_unregister_bufs(inst);

	venus_helper_unregister_bufs(inst);

err_bufs_free:

	intbufs_free(inst);

	venus_helper_intbufs_free(inst);

	return ret;

}

EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming);

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

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <media/videobuf2-v4l2.h>



struct venus_inst;

struct venus_core;



bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt);

struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst,
@@ -53,4 +54,9 @@ int venus_helper_alloc_dpb_bufs(struct venus_inst *inst); 
int venus_helper_free_dpb_bufs(struct venus_inst *inst);

int venus_helper_power_enable(struct venus_core *core, u32 session_type,

			      bool enable);

int venus_helper_intbufs_alloc(struct venus_inst *inst);

int venus_helper_intbufs_free(struct venus_inst *inst);

int venus_helper_queue_dpb_bufs(struct venus_inst *inst);

int venus_helper_unregister_bufs(struct venus_inst *inst);

int venus_helper_load_scale_clocks(struct venus_core *core);

#endif