renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

media: venus: helpers: export few helper functions

Browse Source 
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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Stanimir Varbanov 2019-01-16 10:56:33 -02:00 committed by Mauro Carvalho Chehab
parent d162aea8f6
commit 1e485ee5a7
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/platform/qcom/venus/helpers.c
View File

@ -79,7 +79,7 @@ bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt)
} }
EXPORT_SYMBOL_GPL(venus_helper_check_codec); 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; struct intbuf *buf;
int ret = 0; int ret = 0;
@ -100,6 +100,7 @@ static int venus_helper_queue_dpb_bufs(struct venus_inst *inst)
fail: fail:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(venus_helper_queue_dpb_bufs);
int venus_helper_free_dpb_bufs(struct venus_inst *inst) 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, 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; const unsigned int *intbuf;
size_t arr_sz, i; size_t arr_sz, i;
@ -304,11 +305,13 @@ error:
intbufs_unset_buffers(inst); intbufs_unset_buffers(inst);
return ret; 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); return intbufs_unset_buffers(inst);
} }
EXPORT_SYMBOL_GPL(venus_helper_intbufs_free);
static u32 load_per_instance(struct venus_inst *inst) 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; 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; const struct freq_tbl *table = core->res->freq_tbl;
unsigned int num_rows = core->res->freq_tbl_size; unsigned int num_rows = core->res->freq_tbl_size;
@ -388,6 +391,7 @@ err:
dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret); dev_err(dev, "failed to set clock rate %lu (%d)\n", freq, ret);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(venus_helper_load_scale_clocks);
static void fill_buffer_desc(const struct venus_buffer *buf, static void fill_buffer_desc(const struct venus_buffer *buf,
struct hfi_buffer_desc *bd, bool response) 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; 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 venus_buffer *buf, *n;
struct hfi_buffer_desc bd; struct hfi_buffer_desc bd;
@ -489,6 +493,7 @@ static int session_unregister_bufs(struct venus_inst *inst)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(venus_helper_unregister_bufs);
static int session_register_bufs(struct venus_inst *inst) 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) { if (inst->streamon_out & inst->streamon_cap) {
ret = hfi_session_stop(inst); ret = hfi_session_stop(inst);
ret |= hfi_session_unload_res(inst); ret |= hfi_session_unload_res(inst);
ret |= session_unregister_bufs(inst); ret |= venus_helper_unregister_bufs(inst);
ret |= intbufs_free(inst); ret |= venus_helper_intbufs_free(inst);
ret |= hfi_session_deinit(inst); ret |= hfi_session_deinit(inst);
if (inst->session_error || core->sys_error) 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); venus_helper_free_dpb_bufs(inst);
load_scale_clocks(core); venus_helper_load_scale_clocks(core);
INIT_LIST_HEAD(&inst->registeredbufs); 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; struct venus_core *core = inst->core;
int ret; int ret;
ret = intbufs_alloc(inst); ret = venus_helper_intbufs_alloc(inst);
if (ret) if (ret)
return ret; return ret;
@ -1049,7 +1054,7 @@ int venus_helper_vb2_start_streaming(struct venus_inst *inst)
if (ret) if (ret)
goto err_bufs_free; goto err_bufs_free;
load_scale_clocks(core); venus_helper_load_scale_clocks(core);
ret = hfi_session_load_res(inst); ret = hfi_session_load_res(inst);
if (ret) if (ret)
@ -1070,9 +1075,9 @@ err_session_stop:
err_unload_res: err_unload_res:
hfi_session_unload_res(inst); hfi_session_unload_res(inst);
err_unreg_bufs: err_unreg_bufs:
session_unregister_bufs(inst); venus_helper_unregister_bufs(inst);
err_bufs_free: err_bufs_free:
intbufs_free(inst); venus_helper_intbufs_free(inst);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming); EXPORT_SYMBOL_GPL(venus_helper_vb2_start_streaming);

6
drivers/media/platform/qcom/venus/helpers.h
View File

@ -9,6 +9,7 @@
#include <media/videobuf2-v4l2.h> #include <media/videobuf2-v4l2.h>
struct venus_inst; struct venus_inst;
struct venus_core;
bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt); bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt);
struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst, 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_free_dpb_bufs(struct venus_inst *inst);
int venus_helper_power_enable(struct venus_core *core, u32 session_type, int venus_helper_power_enable(struct venus_core *core, u32 session_type,
bool enable); 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 #endif